Commit 77ac114f authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

The first succesful compilation with CUDA.

parent 8e7c8810

configure.ac

+14 −19
Original line number Diff line number Diff line
@@ -8,25 +8,6 @@ AM_INIT_AUTOMAKE(libtnl,0.1) 
AM_CONFIG_HEADER(config.h)

AM_PROG_LIBTOOL



dnl -----------------------------------------

dnl ----------- check for progs -------------

dnl -----------------------------------------



AC_PROG_CXX

dnl reset CXXFLAGS

CXXFLAGS="" 

AC_PROG_AWK

AC_LANG_SAVE

AC_LANG_CPLUSPLUS





dnl -----------------------------------------

dnl ----------- check for icpc --------------

dnl -----------------------------------------



if test x"$CXX" = xicpc; then

   CXXFLAGS="$CXXFLAGS -DHAVE_ICPC"

fi



dnl -----------------------------------------

dnl ----------- check for CUDA --------------
@@ -118,8 +99,22 @@ then 
fi

AM_CONDITIONAL([working_nvcc], [test "x$working_nvcc" = "xyes"])



dnl -----------------------------------------

dnl ----------- check for progs -------------

dnl -----------------------------------------



AC_PROG_CXX

AC_PROG_AWK

AC_LANG_SAVE

AC_LANG_CPLUSPLUS



dnl -----------------------------------------

dnl ----------- check for icpc --------------

dnl -----------------------------------------



if test x"$CXX" = xicpc; then

   CXXFLAGS="$CXXFLAGS -DHAVE_ICPC"

fi



dnl -----------------------------------------

dnl ----------- check for debug--------------

cuda.mk

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
SUFFIXES = .cu

.cu.$(OBJEXT):

	$(NVCC) -c $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $ (CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -o $@ $<
 
 No newline at end of file

src/Makefile.am

+0 −4
Original line number Diff line number Diff line
@@ -5,10 +5,6 @@ SUBDIRS = core \ 
          diff \

	       matrix







include  ${top_srcdir}/cuda.mk



lib_LTLIBRARIES = libtnl-0.1.la

libtnl_0_1_la_SOURCES =

# Dummy C++ source to cause C++ linking.

src/core/Makefile.am

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ 
#SUBDIRS = 

#endif



include  ${top_srcdir}/cuda.mk



EXTRA_DIST = tnlConfigDescriptionParser.y \

	         tnlConfigDescriptionScanner.l \

	         FlexLexer.h

src/core/tnlLongVectorCUDATester.cu

+4 −5
Original line number Diff line number Diff line 
__global void setZeros( float* A )

#include <core/tnlLongVectorCUDATester.h>



__global__ void setZeros( float* A )

{

   int i = threadId. x;

   int i = threadIdx. x;

   A[ i ] = 0.0;

}

void tnlLongVectorCUDATester< float > :: testKernel()

{

}
 
 No newline at end of file