cmake-format + miscellaneous tweaks (#13)

* cmake-format + miscellaneous tweaks
* Formatted cmake in examples and tests
* Updated linux-ci.yml artifacts naming
* Updated clang-format
* Fixed submodule branches
This commit is contained in:
Jonathan R. Madsen
2021-09-20 11:12:06 -05:00
committed by GitHub
parent e6ead5ab3f
commit 6c93674f92
26 changed files with 1577 additions and 1428 deletions
+1 -2
View File
@@ -1,7 +1,6 @@
cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
project(hosttrace-dyninst-examples
LANGUAGES CXX)
project(hosttrace-dyninst-examples LANGUAGES CXX)
add_subdirectory(transpose)
add_subdirectory(parallel-overhead)
+3 -4
View File
@@ -1,7 +1,6 @@
cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
project(hosttrace-parallel-overhead
LANGUAGES CXX)
project(hosttrace-parallel-overhead LANGUAGES CXX)
set(CMAKE_BUILD_TYPE "Release")
find_package(Threads REQUIRED)
@@ -9,6 +8,6 @@ add_executable(parallel-overhead parallel-overhead.cpp)
target_link_libraries(parallel-overhead Threads::Threads)
if(NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
set_target_properties(parallel-overhead PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
set_target_properties(parallel-overhead PROPERTIES RUNTIME_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR})
endif()
@@ -32,12 +32,9 @@ main(int argc, char** argv)
size_t nthread = 16;
size_t nitr = 50000;
long nfib = 10;
if(argc > 1)
nfib = atol(argv[1]);
if(argc > 2)
nthread = atol(argv[2]);
if(argc > 3)
nitr = atol(argv[3]);
if(argc > 1) nfib = atol(argv[1]);
if(argc > 2) nthread = atol(argv[2]);
if(argc > 3) nitr = atol(argv[3]);
std::vector<std::thread> threads{};
for(size_t i = 0; i < nthread; ++i)
+4 -8
View File
@@ -1,8 +1,6 @@
cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
project(hosttrace-transpose
LANGUAGES CXX)
project(hosttrace-transpose LANGUAGES CXX)
find_program(HIPCC_EXECUTABLE NAMES hipcc)
@@ -31,13 +29,11 @@ if(TRANSPOSE_USE_MPI)
endif()
if(NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
set_target_properties(transpose PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
set_target_properties(transpose PROPERTIES RUNTIME_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR})
if(NOT CMAKE_CXX_COMPILER_IS_HIPCC AND HIPCC_EXECUTABLE)
# defined in MacroUtilities.cmake
hosttrace_custom_compilation(
COMPILER ${HIPCC_EXECUTABLE}
TARGET transpose)
hosttrace_custom_compilation(COMPILER ${HIPCC_EXECUTABLE} TARGET transpose)
endif()
endif()
+1 -2
View File
@@ -161,8 +161,7 @@ main(int argc, char** argv)
MPI_Init(&argc, &argv);
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
#endif
if(rank == 0)
run(argc, argv);
if(rank == 0) run(argc, argv);
#if defined(USE_MPI)
MPI_Barrier(MPI_COMM_WORLD);
MPI_Finalize();
+4 -8
View File
@@ -130,18 +130,14 @@ main(int argc, char** argv)
{
int nx = 32;
int ny = 32;
if(argc > 1)
nx = atoi(argv[1]);
if(argc > 2)
ny = atoi(argv[2]);
if(argc > 1) nx = atoi(argv[1]);
if(argc > 2) ny = atoi(argv[2]);
unsigned int M = 4960;
unsigned int N = 4960;
if(argc > 3)
M = atoi(argv[3]);
if(argc > 4)
N = atoi(argv[4]);
if(argc > 3) M = atoi(argv[3]);
if(argc > 4) N = atoi(argv[4]);
std::cout << "M: " << M << " N: " << N << std::endl;
size_t size = sizeof(int) * M * N;