Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -344,12 +344,11 @@ IF ("${TARGET}" MATCHES "^cuda.*" OR "${TARGET}" MATCHES "multi_gpu")
MAIN_DEPENDENCY "${src}"
IMPLICIT_DEPENDS C "${src}"
COMMAND
nvcc -I${CMAKE_CURRENT_SOURCE_DIR}/${dir}
-I${CMAKE_CURRENT_BINARY_DIR}/${dir}
-O3
--compiler-options -fPIC
-c "${src}"
-o "${dst}"
${SAC2C} -Xc -I${CMAKE_CURRENT_SOURCE_DIR}/${dir}
-Xc -I${CMAKE_CURRENT_BINARY_DIR}/${dir}
-cc ccrmod
"${src}"
-o "${dst}"
WORKING_DIRECTORY
"${CMAKE_CURRENT_BINARY_DIR}/${dir}"
COMMENT "Generating ${dst} for target `${TARGET}'"
Expand Down
9 changes: 5 additions & 4 deletions src/auxiliary/src/CudaBenchmarking/bench.cu
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
extern "C" {

#include <stdarg.h>
#include <sacinterface.h>
#include <string.h>
#include <time.h>
#include <cuda.h>
Expand Down Expand Up @@ -80,7 +81,7 @@ void benchCreate( struct cudabench** interval)
/* benchGetInterval actually creates the data structure */
}

struct cudabench* benchGetInterval_si(char * name, sac_int num)
struct cudabench* benchGetInterval_si(const char * name, sac_int num)
{
struct cudabench *interval;
char* newName;
Expand All @@ -100,14 +101,14 @@ struct cudabench* benchGetInterval_i( sac_int num)
return( interval);
}

struct cudabench* benchGetInterval_s( char *name)
struct cudabench* benchGetInterval_s(const char *name)
{
struct cudabench *interval;
interval = benchGetInterval_si(name, -1);
return( interval);
}

struct cudabench* benchGetInterval_siu(char * name, sac_int num, sac_int timeunit)
struct cudabench* benchGetInterval_siu(const char * name, sac_int num, sac_int timeunit)
{
struct cudabench *interval;
char* newName;
Expand All @@ -127,7 +128,7 @@ struct cudabench* benchGetInterval_iu( sac_int num, sac_int timeunit)
return( interval);
}

struct cudabench* benchGetInterval_su( char *name, sac_int timeunit)
struct cudabench* benchGetInterval_su(const char *name, sac_int timeunit)
{
struct cudabench *interval;
interval = benchGetInterval_siu(name, -1, timeunit);
Expand Down