compilation errors fix

sp3mm-interface
wlthr 2 years ago
parent 9b6542d350
commit 981e40f689

@ -14,7 +14,9 @@ LDFLAGS = -lm
LIBDIR=../../../ LIBDIR=../../../
LIBFILE=$(LIBDIR)/$(LIBNAME) LIBFILE=$(LIBDIR)/$(LIBNAME)
SP3MM_CORE_OBJS=commons/ompGetICV.o \ SP3MM_CORE_OBJS=Sp3MM_CSR_OMP_Multi.o \
Sp3MM_CSR_OMP_SymbStep_Multi.o \
commons/ompGetICV.o \
commons/sparseUtilsMulti.o \ commons/sparseUtilsMulti.o \
commons/utils.o \ commons/utils.o \
lib/linuxK_rbtree_minimalized.o \ lib/linuxK_rbtree_minimalized.o \

@ -1,5 +1,6 @@
#include "../include/Sp3MM_CSR_OMP_Multi.h" #include "../include/Sp3MM_CSR_OMP_Multi.h"
#include "../include/utils.h" #include "../include/utils.h"
#include <stdio.h>
enum impl_types enum impl_types
{ {
@ -71,7 +72,7 @@ void psb_f_spmm_merge_spacc(void **accumul,
switch (impl_choice) switch (impl_choice)
{ {
case ROW_BY_ROW_UB: case ROW_BY_ROW_UB:
*info = spmmRowByRowPopulate_0(accumul, rows_sizes, tmp_matrix, c_as, c_ja, c_irp); spmmRowByRowPopulate_0(accumul, rows_sizes, tmp_matrix, c_as, c_ja, c_irp);
break; break;
default: default:
break; break;

@ -52,7 +52,7 @@
///generate colParts versions ///generate colParts versions
#define COL_PARTS COL_PARTS_ON #define COL_PARTS COL_PARTS_ON
#include "Sp3MM_CSR_OMP_SymbStep_Generic.h" #include "Sp3MM_CSR_OMP_SymbStep_Generic.h"
//generate outIdxs AND colParts ve sions //generate outIdxs AND colParts versions
#define OUT_IDXS OUT_IDXS_ON #define OUT_IDXS OUT_IDXS_ON
#include "Sp3MM_CSR_OMP_SymbStep_Generic.h" #include "Sp3MM_CSR_OMP_SymbStep_Generic.h"

@ -58,6 +58,11 @@ SPMM CAT(spmmSerial_,OFF_F); //mono thread version for debug oracle-less
* return resulting product matrix * return resulting product matrix
*/ */
SPMM CAT(spmmRowByRow_,OFF_F); SPMM CAT(spmmRowByRow_,OFF_F);
idx_t CAT(spmmRowByRowCalculateSize_,OFF_F) (spmat* A, spmat*B, CONFIG* cfg, void** accumul, void **rows_sizes, void** tmp_matrix);
void CAT(spmmRowByRowPopulate_,OFF_F)(void** accumul, void** rows_sizes, void** tmp_matrix, double** AS, idx_t** JA, idx_t** IRP);
/* /*
* sparse parallel implementation of @A * @B parallelizing Gustavson * sparse parallel implementation of @A * @B parallelizing Gustavson
* with partitioning of @A in @conf->gridRows blocks of rows * with partitioning of @A in @conf->gridRows blocks of rows

Loading…
Cancel
Save