From 689415f8e9365e9ec541de28393e666ce40877cc Mon Sep 17 00:00:00 2001 From: Mark Berrill Date: Tue, 12 Jan 2016 14:26:48 -0500 Subject: [PATCH 1/5] Fixing compile error on MAC --- tests/lbpm_color_simulator.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lbpm_color_simulator.h b/tests/lbpm_color_simulator.h index a3d6814e..c4abd442 100644 --- a/tests/lbpm_color_simulator.h +++ b/tests/lbpm_color_simulator.h @@ -97,7 +97,7 @@ public: static int max_id = -1; new_id->first = new_index->first; new_id->second = new_index->second; - if ( last_id!=NULL ) { + if ( last_id.get()!=NULL ) { // Compute the timestep-timestep map const IntArray& old_ids = last_id->second; ID_map_struct map = computeIDMap(Nx,Ny,Nz,old_ids,ids,newcomm); From 98b8cf2ef864bdcd28200a5f526e81dc103ba91a Mon Sep 17 00:00:00 2001 From: Mark Berrill Date: Tue, 12 Jan 2016 14:31:19 -0500 Subject: [PATCH 2/5] Supressing warnings with clang --- cmake/macros.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/macros.cmake b/cmake/macros.cmake index cb068d05..b2a1c83b 100644 --- a/cmake/macros.cmake +++ b/cmake/macros.cmake @@ -372,8 +372,8 @@ MACRO( SET_WARNINGS ) SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} --diag_suppress 111,128,185") ELSEIF ( USING_CLANG ) # Add default compiler options - SET(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS} -Wall") - SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wall") + SET(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS} -Wall -Wno-char-subscripts -Wno-unused-private-field -Wno-unused-variable") + SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wall -Wno-char-subscripts -Wno-unused-private-field -Wno-unused-variable") ELSEIF ( USING_DEFAULT ) # Add default compiler options SET(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS}") From aca03a5b2912ad834e503f1a0edb69d8db4d07cc Mon Sep 17 00:00:00 2001 From: Mark Berrill Date: Tue, 12 Jan 2016 14:35:28 -0500 Subject: [PATCH 3/5] Minor CMake cleanup --- cmake/ctest_script.cmake | 2 +- cmake/macros.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/ctest_script.cmake b/cmake/ctest_script.cmake index 5ffc6a0f..b5d1fc9c 100644 --- a/cmake/ctest_script.cmake +++ b/cmake/ctest_script.cmake @@ -208,7 +208,7 @@ SET( CTEST_OPTIONS "${CTEST_OPTIONS};-DENABLE_GCOV:BOOL=${ENABLE_GCOV}" ) IF ( USE_MPI ) SET( CTEST_OPTIONS "${CTEST_OPTIONS};-DMPI_COMPILER:BOOL=true;-DMPIEXEC=${MPIEXEC}") IF ( NOT USE_VALGRIND ) - SET( CTEST_OPTIONS "${CTEST_OPTIONS};-DUSE_EXT_MPI_FOR_SERIAL_TESTS:BOOL=true") + SET( CTEST_OPTIONS "${CTEST_OPTIONS};-DUSE_MPI_FOR_SERIAL_TESTS:BOOL=true") ENDIF() ELSE() SET( CTEST_OPTIONS "${CTEST_OPTIONS};-DUSE_MPI:BOOL=false") diff --git a/cmake/macros.cmake b/cmake/macros.cmake index b2a1c83b..a556f6cf 100644 --- a/cmake/macros.cmake +++ b/cmake/macros.cmake @@ -613,7 +613,7 @@ MACRO( ADD_PROJ_EXE_DEP EXE ) SET_TARGET_PROPERTIES( ${EXE} PROPERTIES LINK_FLAGS "${LDFLAGS}" ) SET_TARGET_PROPERTIES( ${EXE} PROPERTIES LINK_FLAGS "${LDFLAGS_EXTRA}" ) TARGET_LINK_LIBRARIES( ${EXE} ${LINK_LIBRARIES} ) - TARGET_LINK_LIBRARIES( ${EXE} ${CUDA_LIBS} ) + TARGET_LINK_LIBRARIES( ${EXE} ${CUDA_LIBS} ${CUDA_LIBRARIES} ) TARGET_LINK_LIBRARIES( ${EXE} ${EXTERNAL_LIBS} ) IF ( USE_MPI OR USE_EXT_MPI OR HAVE_MPI ) TARGET_LINK_LIBRARIES( ${EXE} ${MPI_LINK_FLAGS} ${MPI_LIBRARIES} ) @@ -714,7 +714,7 @@ FUNCTION( ADD_${PROJ}_TEST EXEFILE ${ARGN} ) RETURN() ENDIF() # Add the provisional test - ADD_PROJ_PROVISIONAL_TEST ( ${EXEFILE} ) + ADD_PROJ_PROVISIONAL_TEST( ${EXEFILE} ) CREATE_TEST_NAME( ${EXEFILE} ${ARGN} ) GET_TARGET_PROPERTY(EXE ${EXEFILE} LOCATION) STRING(REGEX REPLACE "\\$\\(Configuration\\)" "${CONFIGURATION}" EXE "${EXE}" ) @@ -736,7 +736,7 @@ FUNCTION( ADD_${PROJ}_WEEKLY_TEST EXEFILE PROCS ${ARGN} ) RETURN() ENDIF() # Add the provisional test - ADD_PROJ_PROVISIONAL_TEST ( ${EXEFILE} ) + ADD_PROJ_PROVISIONAL_TEST( ${EXEFILE} ) GET_TARGET_PROPERTY(EXE ${EXEFILE} LOCATION) STRING(REGEX REPLACE "\\$\\(Configuration\\)" "${CONFIGURATION}" EXE "${EXE}" ) IF( ${PROCS} STREQUAL "1" ) From 5d139fe9bc737219fa3d2bc0df7d3e8a92798945 Mon Sep 17 00:00:00 2001 From: Mark Berrill Date: Tue, 12 Jan 2016 14:41:22 -0500 Subject: [PATCH 4/5] Fixing some compiler warnings --- analysis/analysis.cpp | 2 +- tests/TestBlobIdentify.cpp | 4 ++-- tests/TestCommD3Q19.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/analysis/analysis.cpp b/analysis/analysis.cpp index a8dd6b32..1b11222a 100644 --- a/analysis/analysis.cpp +++ b/analysis/analysis.cpp @@ -496,7 +496,7 @@ void gatherSrcIDMap( map_type& src_map, MPI_Comm comm ) const std::map& src_ids = it->second; send_data.push_back(id); send_data.push_back(src_ids.size()); - typename std::map::const_iterator it2; + std::map::const_iterator it2; for (it2=src_ids.begin(); it2!=src_ids.end(); ++it2) { send_data.push_back(it2->first); send_data.push_back(it2->second); diff --git a/tests/TestBlobIdentify.cpp b/tests/TestBlobIdentify.cpp index 3d7b8480..73d00359 100644 --- a/tests/TestBlobIdentify.cpp +++ b/tests/TestBlobIdentify.cpp @@ -91,7 +91,7 @@ std::vector create_bubbles( int N_bubbles, double Lx, double Ly, } } size_t N_bytes = N_bubbles*sizeof(bubble_struct); - MPI_Bcast(&bubbles[0],N_bytes,MPI_CHAR,0,comm); + MPI_Bcast((char*)&bubbles[0],N_bytes,MPI_CHAR,0,comm); return bubbles; } @@ -297,7 +297,7 @@ int main(int argc, char **argv) velocity[i].z = bubbles[i].radius*(2*rand2()-1); } } - MPI_Bcast(&velocity[0],bubbles.size()*sizeof(Point),MPI_CHAR,0,comm); + MPI_Bcast((char*)&velocity[0],bubbles.size()*sizeof(Point),MPI_CHAR,0,comm); fillBubbleData( bubbles, Phase, SignDist, Lx, Ly, Lz, rank_info ); fillData.fill(Phase); fillData.fill(SignDist); diff --git a/tests/TestCommD3Q19.cpp b/tests/TestCommD3Q19.cpp index baa1ef06..0b6e0dac 100644 --- a/tests/TestCommD3Q19.cpp +++ b/tests/TestCommD3Q19.cpp @@ -247,8 +247,8 @@ int main(int argc, char **argv) MPI_Bcast(&Nx,1,MPI_INT,0,comm); MPI_Bcast(&Ny,1,MPI_INT,0,comm); MPI_Bcast(&Nz,1,MPI_INT,0,comm); - MPI_Bcast(&nBlocks,1,MPI_INT,0,comm); - MPI_Bcast(&nthreads,1,MPI_INT,0,comm); + MPI_Bcast(&nBlocks,1,MPI_UNSIGNED,0,comm); + MPI_Bcast(&nthreads,1,MPI_UNSIGNED,0,comm); MPI_Bcast(×tepMax,1,MPI_INT,0,comm); MPI_Bcast(&Nx,1,MPI_INT,0,comm); From 865726d3c0cf3a800ab1a3e9eeef2b435a6ba7c6 Mon Sep 17 00:00:00 2001 From: Mark Berrill Date: Fri, 29 Jan 2016 10:47:15 -0500 Subject: [PATCH 5/5] Fixing failing test --- common/Utilities.cpp | 8 ++++++++ common/Utilities.h | 3 +++ tests/testUtilities.cpp | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/common/Utilities.cpp b/common/Utilities.cpp index 3e8eca8b..f227b8e0 100644 --- a/common/Utilities.cpp +++ b/common/Utilities.cpp @@ -347,3 +347,11 @@ std::vector Utilities::factor(size_t number) std::sort( factors.begin(), factors.end() ); return factors; } + + +// Dummy function to prevent compiler from optimizing away variable +void Utilities::nullUse( void* data ) +{ + NULL_USE(data); +} + diff --git a/common/Utilities.h b/common/Utilities.h index 5c1424e7..e1f1713d 100644 --- a/common/Utilities.h +++ b/common/Utilities.h @@ -61,6 +61,9 @@ namespace Utilities //! Factor a number into it's prime factors std::vector factor(size_t number); + //! Print AMP Banner + void nullUse( void* ); + } // namespace Utilities diff --git a/tests/testUtilities.cpp b/tests/testUtilities.cpp index 72c637d1..afb3e33b 100644 --- a/tests/testUtilities.cpp +++ b/tests/testUtilities.cpp @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) double time1 = Utilities::time() - t0; uint64_t *tmp = new uint64_t[0x100000]; memset(tmp,0xAA,0x100000*sizeof(uint64_t)); - NULL_USE(tmp); + Utilities::nullUse( tmp ); t0 = Utilities::time(); size_t n_bytes2 = Utilities::getMemoryUsage(); double time2 = Utilities::time() - t0;