Fix cuda sources to use psb_config.h

randomized
sfilippone 1 year ago
parent fd90ecb643
commit 333f0e0fb7

@ -35,7 +35,7 @@
#include <stdlib.h>
#include <stdio.h>
#include "psb_config.h"
#include "core.h"
#define ELL_PITCH_ALIGN_S 32

@ -9,6 +9,7 @@ MODDIR=$(TOP)/modules
LIBNAME=libspgpu.a
OBJS=coo.o core.o dia.o ell.o hdia.o hell.o
CU_INCLUDES=-I$(INCDIR) $(CUDA_INCLUDES)
all: includes objs
@ -31,9 +32,9 @@ clean: iclean
iclean:
$(MAKE) -C kernels clean
.c.o:
$(CC) $(CCOPT) $(CINCLUDES) $(CDEFINES) $(CUDA_INCLUDES) -c $<
$(CC) $(CCOPT) $(CINCLUDES) $(CDEFINES) $(CU_INCLUDES) -c $<
.cpp.o:
$(CXX) $(CXXOPT) $(CXXINCLUDES) $(CXXDEFINES) $(CUDA_INCLUDES) -c $< -o $@
$(CXX) $(CXXOPT) $(CXXINCLUDES) $(CXXDEFINES) $(CU_INCLUDES) -c $< -o $@
.cu.o:
$(NVCC) $(CINCLUDES) $(CDEFINES) $(CUDEFINES) $(CUDA_INCLUDES) -c $<
$(NVCC) $(CINCLUDES) $(CDEFINES) $(CUDEFINES) $(CU_INCLUDES) -c $<

@ -46,7 +46,7 @@
* GNU General Public License for more details.
*/
#include "psb_config.h"
#include "driver_types.h"
#include "cuComplex.h"

@ -9,7 +9,7 @@ MODDIR=$(TOP)/modules
UP=..
LIBNAME=$(UP)/libspgpu.a
CINCLUDES=-I$(INCDIR)
CU_INCLUDES=-I$(INCDIR) $(CUDA_INCLUDES)
OBJS=cabs.o camax.o casum.o caxpby.o caxy.o cdot.o cgath.o \
cnrm2.o cscal.o cscat.o csetscal.o cupd_xyz.o\
dabs.o damax.o dasum.o daxpby.o daxy.o ddot.o dgath.o dupd_xyz.o\
@ -30,5 +30,5 @@ lib: objs
clean:
/bin/rm -fr $(OBJS)
.cu.o:
$(NVCC) $(CINCLUDES) $(CDEFINES) $(CUDEFINES) $(CUDA_INCLUDES) -c $<
$(NVCC) $(CINCLUDES) $(CDEFINES) $(CUDEFINES) $(CU_INCLUDES) -c $<

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -16,11 +16,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "cuComplex.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
int getGPUMultiProcessors();
int getGPUMaxThreadsPerMP();

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -19,10 +19,10 @@
#include "cudadebug.h"
#include "cuComplex.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -19,10 +19,10 @@
#include "cudadebug.h"
#include "cuComplex.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include <cuda_runtime.h>
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
int getGPUMultiProcessors();
int getGPUMaxThreadsPerMP();

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include <cuda_runtime.h>
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
int getGPUMultiProcessors();
int getGPUMaxThreadsPerMP();

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include <cuda_runtime.h>
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
int getGPUMultiProcessors();
int getGPUMaxThreadsPerMP();

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -18,10 +18,10 @@
#include "cudalang.h"
#include "cudadebug.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "cuComplex.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "dia.h"
}

@ -16,10 +16,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "dia.h"
}

@ -16,10 +16,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "dia.h"
}

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "cuComplex.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "dia.h"
}

@ -18,10 +18,10 @@
#include "cudalang.h"
#include "cudadebug.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include <cuda_runtime.h>
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
int getGPUMultiProcessors();
int getGPUMaxThreadsPerMP();

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include <cuda_runtime.h>
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
int getGPUMultiProcessors();
int getGPUMaxThreadsPerMP();

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "cuComplex.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "ell.h"
}

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "cuComplex.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "ell.h"
}

@ -16,10 +16,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "ell.h"
}

@ -16,10 +16,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "ell.h"
}

@ -16,10 +16,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "ell.h"
}

@ -16,10 +16,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "ell.h"
}

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "cuComplex.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "ell.h"
}

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "cuComplex.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "ell.h"
}

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "cuComplex.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "hdia.h"
}

@ -16,10 +16,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "hdia.h"
}

@ -16,10 +16,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "hdia.h"
}

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "cuComplex.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "hdia.h"
}

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "cuComplex.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "hell.h"
}

@ -16,10 +16,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "hell.h"
}

@ -16,10 +16,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "hell.h"
}

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include "cuComplex.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "hell.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -15,10 +15,10 @@
*/
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
int getGPUMultiProcessors();
int getGPUMaxThreadsPerMP();

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudalang.h"
#include "cudadebug.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -18,10 +18,10 @@
#include "cudalang.h"
#include "cudadebug.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include <cuda_runtime.h>
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
int getGPUMultiProcessors();
int getGPUMaxThreadsPerMP();

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include <cuda_runtime.h>
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
int getGPUMultiProcessors();
int getGPUMaxThreadsPerMP();

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -18,10 +18,10 @@
#include "cudalang.h"
#include "cuComplex.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
int getGPUMultiProcessors();
int getGPUMaxThreadsPerMP();

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -20,10 +20,10 @@
#include "cuComplex.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -19,10 +19,10 @@
#include "cudadebug.h"
#include "cuComplex.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "stdio.h"
#include "cudadebug.h"
#include "cudalang.h"
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
}

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include <cuda_runtime.h>
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
int getGPUMultiProcessors();
int getGPUMaxThreadsPerMP();

@ -17,10 +17,10 @@
#include "cudadebug.h"
#include "cudalang.h"
#include <cuda_runtime.h>
#include "core.h"
extern "C"
{
#include "core.h"
#include "vector.h"
int getGPUMultiProcessors();
int getGPUMaxThreadsPerMP();

Loading…
Cancel
Save