OverviewFilesCommitsIssuesDocsReleasesPeers

opencog-CompactHash commits / 01652e0

Turning off memory usage writes by default and fixing gcc compiler warning
01652e03fcd325fc753809be50c26d88b6d5f745
by brobey <brobey@lanl.gov> · 2016-01-24T23:21:14.000Z

Changed files (2) +6 -9

CMakeLists.txt +5 -8
……@@ -33,10 +33,6 @@ elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
3333 # using Visual Studio C++
3434endif()
3535
36set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -g -O0 -Wextra")
37set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3")
38set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELDEBINFO} -g -O3")
39
4036if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
4137 # using Clang
4238 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftree-vectorize")
……@@ -57,10 +53,6 @@ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -g -O0 -Wextra")
5753set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3")
5854set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELDEBINFO} -g -O3")
5955
60set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -g -O0 -Wextra")
61set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
62set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELDEBINFO} -g -O3")
63
6456if (MIC_NATIVE)
6557 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-intel -mmic")
6658 link_directories("/projects/opt/intel/compilers/parallel_studio_xe_2013/composer_xe_2013_sp1.2.144/compiler/lib/mic")
……@@ -83,6 +75,9 @@ endif (MIC_NATIVE)
8375# include_directories(${MPI_INCLUDE_PATH})
8476#endif (MPI_FOUND)
8577
78# to get rid of gcc compiler complaining about implicit declaration of drand48
79add_definitions(-D_SVID_SOURCE)
80
8681add_subdirectory(HashFactory)
8782add_subdirectory(kdtree)
8883add_subdirectory(timer)
……@@ -107,7 +102,9 @@ set (NEIGH2D_HDRS gpu.h)
107102add_executable(neigh2d ${NEIGH2D_SRCS} ${NEIGH2D_HDRS})
108103target_link_libraries(neigh2d HashFactory simplehash kdtree timer m)
109104if (OPENCL_FOUND)
105# Setting default in code to off, so set WRITE_MEM_USAGE to 1 if memory use output is wanted (cmake -DWRITE_MEM_USAGE=1)
110106 set_target_properties(neigh2d PROPERTIES COMPILE_DEFINITIONS "HAVE_OPENCL")
107# set_target_properties(neigh2d PROPERTIES COMPILE_DEFINITIONS "HAVE_OPENCL;WRITE_MEM_USAGE=0")
111108 target_link_libraries(neigh2d ${OPENCL_LIBRARIES})
112109# add_dependencies(neigh2d neigh2d_kernel_source)
113110endif(OPENCL_FOUND)
neigh2d.c +1 -1
……@@ -93,7 +93,7 @@ int TILE_SIZE_INIT = 128;
9393#endif
9494
9595#ifndef WRITE_MEM_USAGE
96#define WRITE_MEM_USAGE 1
96#define WRITE_MEM_USAGE 0
9797#endif
9898
9999#define CHECK 1