diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a8802f9f720933ee4c5a7f7febefeae17d1c19d..99b5d3cf0fb015fca5b0e355c3b9c4f13efc5c86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,7 +193,7 @@ endif() #---------------------------------------------------------- # Built-in profiler #---------------------------------------------------------- -option(ARB_WITH_PROFILING "use built-in profiling of miniapp" OFF) +option(ARB_WITH_PROFILING "use built-in profiling" OFF) if(ARB_WITH_PROFILING) add_definitions(-DARB_HAVE_PROFILING) endif() @@ -266,7 +266,6 @@ include_directories( "${PROJECT_SOURCE_DIR}/tclap" "${PROJECT_SOURCE_DIR}/include" "${PROJECT_SOURCE_DIR}/src" - "${PROJECT_SOURCE_DIR}/miniapp" "${PROJECT_SOURCE_DIR}/modcc" "${PROJECT_SOURCE_DIR}") if(EXTERNAL_INCLUDES) @@ -289,6 +288,6 @@ endif() add_subdirectory(src) add_subdirectory(mechanisms) # after src path so that gpu_mechanism library is last on link line add_subdirectory(tests) -add_subdirectory(miniapps) +add_subdirectory(example) add_subdirectory(lmorpho) add_subdirectory(doc) diff --git a/miniapps/CMakeLists.txt b/example/CMakeLists.txt similarity index 100% rename from miniapps/CMakeLists.txt rename to example/CMakeLists.txt diff --git a/miniapps/miniapp/CMakeLists.txt b/example/miniapp/CMakeLists.txt similarity index 88% rename from miniapps/miniapp/CMakeLists.txt rename to example/miniapp/CMakeLists.txt index 85b25f7b3fe1dc03178dce4e8e7b304f9e21b629..70bfd6176610ab77f4255fb75d9ef951e7420256 100644 --- a/miniapps/miniapp/CMakeLists.txt +++ b/example/miniapp/CMakeLists.txt @@ -19,5 +19,5 @@ endif() set_target_properties( miniapp.exe PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/miniapps/miniapp" + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/example" ) diff --git a/miniapps/miniapp/README.md b/example/miniapp/README.md similarity index 100% rename from miniapps/miniapp/README.md rename to example/miniapp/README.md diff --git a/miniapps/miniapp/io.cpp b/example/miniapp/io.cpp similarity index 100% rename from miniapps/miniapp/io.cpp rename to example/miniapp/io.cpp diff --git a/miniapps/miniapp/io.hpp b/example/miniapp/io.hpp similarity index 100% rename from miniapps/miniapp/io.hpp rename to example/miniapp/io.hpp diff --git a/miniapps/miniapp/miniapp.cpp b/example/miniapp/miniapp.cpp similarity index 100% rename from miniapps/miniapp/miniapp.cpp rename to example/miniapp/miniapp.cpp diff --git a/miniapps/miniapp/miniapp_recipes.cpp b/example/miniapp/miniapp_recipes.cpp similarity index 100% rename from miniapps/miniapp/miniapp_recipes.cpp rename to example/miniapp/miniapp_recipes.cpp diff --git a/miniapps/miniapp/miniapp_recipes.hpp b/example/miniapp/miniapp_recipes.hpp similarity index 100% rename from miniapps/miniapp/miniapp_recipes.hpp rename to example/miniapp/miniapp_recipes.hpp diff --git a/miniapps/miniapp/morphology_pool.cpp b/example/miniapp/morphology_pool.cpp similarity index 100% rename from miniapps/miniapp/morphology_pool.cpp rename to example/miniapp/morphology_pool.cpp diff --git a/miniapps/miniapp/morphology_pool.hpp b/example/miniapp/morphology_pool.hpp similarity index 100% rename from miniapps/miniapp/morphology_pool.hpp rename to example/miniapp/morphology_pool.hpp diff --git a/miniapps/miniapp/plot.py b/example/miniapp/plot.py similarity index 100% rename from miniapps/miniapp/plot.py rename to example/miniapp/plot.py diff --git a/miniapps/miniapp/trace.cpp b/example/miniapp/trace.cpp similarity index 100% rename from miniapps/miniapp/trace.cpp rename to example/miniapp/trace.cpp diff --git a/miniapps/miniapp/trace.hpp b/example/miniapp/trace.hpp similarity index 100% rename from miniapps/miniapp/trace.hpp rename to example/miniapp/trace.hpp diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh index 799c4ef7497a5ebd287ac351d76d2dbe07cb676f..9175044c3bb89c0e7ca16063c7ef88a665ab2cb9 100755 --- a/scripts/travis/build.sh +++ b/scripts/travis/build.sh @@ -60,6 +60,6 @@ ${launch} ./tests/global_communication.exe || error "running global communicatio progress "Miniapp spike comparison test" make miniapp.exe -j4 || error "building miniapp" -${launch} ./miniapps/miniapp/miniapp.exe -n 20 -t 100 || error "running miniapp" +${launch} ./example/miniapp.exe -n 20 -t 100 || error "running miniapp" cd $base_path