diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 5a6433eaa..5c212914d 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -18,27 +18,27 @@ jobs: - name: Install OpenMP shell: bash run: | - bash scripts/utils/install_openmp_ubuntu.sh + bash tools/ubuntu/install_openmp.sh - name: Install clang-tidy shell: bash run: | - bash scripts/utils/install_clang_tidy_ubuntu.sh + bash tools/ubuntu/install_clang_tidy.sh - name: Download dependencies shell: bash run: | - bash scripts/utils/download_dependencies.sh + bash tools/dev/download_dependencies.sh - name: Configure project shell: bash run: | - bash scripts/ci/configure_openmp_clang_tidy.sh + bash tools/backend/configure_openmp_clang_tidy.sh - name: Build project shell: bash run: | - bash scripts/build.sh Debug + bash tools/build.sh Debug Cppcheck: runs-on: ubuntu-22.04 @@ -49,24 +49,24 @@ jobs: - name: Install OpenMP shell: bash run: | - bash scripts/utils/install_openmp_ubuntu.sh + bash tools/ubuntu/install_openmp.sh - name: Install cppcheck shell: bash run: | - bash scripts/utils/install_cppcheck_ubuntu.sh + bash tools/ubuntu/install_cppcheck.sh - name: Download dependencies shell: bash run: | - bash scripts/utils/download_dependencies.sh + bash tools/dev/download_dependencies.sh - name: Configure project shell: bash run: | - bash scripts/ci/configure_openmp_cppcheck.sh + bash tools/backend/configure_openmp_cppcheck.sh - name: Build project shell: bash run: | - bash scripts/build.sh Debug + bash tools/build.sh Debug diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index d88001a5e..641b5f697 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -18,32 +18,32 @@ jobs: - name: Install OpenMP shell: bash run: | - bash scripts/utils/install_openmp_ubuntu.sh + bash tools/ubuntu/install_openmp.sh - name: Install lcov shell: bash run: | - bash scripts/utils/install_lcov_ubuntu.sh + bash tools/ubuntu/install_lcov.sh - name: Download dependencies shell: bash run: | - bash scripts/utils/download_dependencies.sh + bash tools/dev/download_dependencies.sh - name: Configure project shell: bash run: | - bash scripts/ci/configure_openmp_lcov.sh + bash tools/backend/configure_openmp_lcov.sh - name: Build project shell: bash run: | - bash scripts/build.sh Debug + bash tools/build.sh Debug - name: Run coverage shell: bash run: | - bash scripts/ci/run_coverage.sh + bash tools/dev/run_coverage.sh - name: Upload coverage report uses: codecov/codecov-action@v3 diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 16b144aa8..89a9cc158 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -21,27 +21,27 @@ jobs: - name: Install OpenMP shell: bash run: | - bash scripts/utils/install_openmp_ubuntu.sh + bash tools/ubuntu/install_openmp.sh - name: Install docs dependencies shell: bash run: | - bash scripts/utils/install_docs_dependencies_ubuntu.sh + bash tools/ubuntu/install_docs_dependencies.sh - name: Download dependencies shell: bash run: | - bash scripts/utils/download_dependencies.sh + bash tools/dev/download_dependencies.sh - name: Configure project shell: bash run: | - bash scripts/ci/configure_openmp_documentation.sh + bash tools/backend/configure_openmp_documentation.sh - name: Build documentation shell: bash run: | - bash scripts/utils/build_documentation.sh + bash tools/dev/build_documentation.sh - name: Deploy documentation uses: JamesIves/github-pages-deploy-action@v4 diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index a761a8812..20e850bd0 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -18,24 +18,24 @@ jobs: - name: Install OpenMP shell: bash run: | - bash scripts/utils/install_openmp_ubuntu.sh + bash tools/ubuntu/install_openmp.sh - name: Install clang-format shell: bash run: | - bash scripts/utils/install_clang_format_ubuntu2004.sh + bash tools/ubuntu/install_clang_format.sh - name: Download dependencies shell: bash run: | - bash scripts/utils/download_dependencies.sh + bash tools/dev/download_dependencies.sh - name: Configure project shell: bash run: | - bash scripts/ci/configure_openmp.sh + bash tools/backend/configure_openmp.sh - name: Check style shell: bash run: | - bash scripts/utils/check_code_style.sh + bash tools/dev/check_code_style.sh diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 62d4854a5..534d0c4f6 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -30,52 +30,52 @@ jobs: - name: Install OpenMP shell: bash run: | - bash scripts/utils/install_openmp_ubuntu.sh + bash tools/ubuntu/install_openmp.sh - name: Download dependencies shell: bash run: | - bash scripts/utils/download_dependencies.sh + bash tools/dev/download_dependencies.sh - name: Set C/C++ compiler shell: bash run: | - bash scripts/utils/set_cxx_compiler_ubuntu.sh ${{ matrix.CC }} ${{ matrix.CXX }} + bash tools/ubuntu/set_cxx_compiler.sh ${{ matrix.CC }} ${{ matrix.CXX }} - name: Configure project shell: bash run: | - bash scripts/ci/configure_openmp.sh ${{ matrix.BuildType }} -DSTDGPU_BUILD_SHARED_LIBS=${{ matrix.SharedLibs }} -DSTDGPU_USE_32_BIT_INDEX=${{ matrix.Use32BitIndex }} + bash tools/backend/configure_openmp.sh ${{ matrix.BuildType }} -DSTDGPU_BUILD_SHARED_LIBS=${{ matrix.SharedLibs }} -DSTDGPU_USE_32_BIT_INDEX=${{ matrix.Use32BitIndex }} - name: Build project shell: bash run: | - bash scripts/build.sh ${{ matrix.BuildType }} + bash tools/build.sh ${{ matrix.BuildType }} - name: Run tests shell: bash run: | - bash scripts/run_tests.sh ${{ matrix.BuildType }} + bash tools/run_tests.sh ${{ matrix.BuildType }} - name: Verify headers shell: bash run: | - bash scripts/utils/verify_headers.sh + bash tools/dev/verify_headers.sh - name: Install project shell: bash run: | - bash scripts/install.sh ${{ matrix.BuildType }} + bash tools/install.sh ${{ matrix.BuildType }} - name: Check linking to installed project shell: bash run: | - bash scripts/ci/check_install_openmp.sh ${{ matrix.BuildType }} + bash tools/backend/check_install_openmp.sh ${{ matrix.BuildType }} - name: Uninstall project shell: bash run: | - bash scripts/uninstall.sh ${{ matrix.BuildType }} + bash tools/uninstall.sh ${{ matrix.BuildType }} Ubuntu-2204: runs-on: ubuntu-22.04 @@ -98,49 +98,49 @@ jobs: - name: Install OpenMP shell: bash run: | - bash scripts/utils/install_openmp_ubuntu.sh + bash tools/ubuntu/install_openmp.sh - name: Download dependencies shell: bash run: | - bash scripts/utils/download_dependencies.sh + bash tools/dev/download_dependencies.sh - name: Set C/C++ compiler shell: bash run: | - bash scripts/utils/set_cxx_compiler_ubuntu.sh ${{ matrix.CC }} ${{ matrix.CXX }} + bash tools/ubuntu/set_cxx_compiler.sh ${{ matrix.CC }} ${{ matrix.CXX }} - name: Configure project shell: bash run: | - bash scripts/ci/configure_openmp.sh ${{ matrix.BuildType }} -DSTDGPU_BUILD_SHARED_LIBS=${{ matrix.SharedLibs }} -DSTDGPU_USE_32_BIT_INDEX=${{ matrix.Use32BitIndex }} + bash tools/backend/configure_openmp.sh ${{ matrix.BuildType }} -DSTDGPU_BUILD_SHARED_LIBS=${{ matrix.SharedLibs }} -DSTDGPU_USE_32_BIT_INDEX=${{ matrix.Use32BitIndex }} - name: Build project shell: bash run: | - bash scripts/build.sh ${{ matrix.BuildType }} + bash tools/build.sh ${{ matrix.BuildType }} - name: Run tests shell: bash run: | - bash scripts/run_tests.sh ${{ matrix.BuildType }} + bash tools/run_tests.sh ${{ matrix.BuildType }} - name: Verify headers shell: bash run: | - bash scripts/utils/verify_headers.sh + bash tools/dev/verify_headers.sh - name: Install project shell: bash run: | - bash scripts/install.sh ${{ matrix.BuildType }} + bash tools/install.sh ${{ matrix.BuildType }} - name: Check linking to installed project shell: bash run: | - bash scripts/ci/check_install_openmp.sh ${{ matrix.BuildType }} + bash tools/backend/check_install_openmp.sh ${{ matrix.BuildType }} - name: Uninstall project shell: bash run: | - bash scripts/uninstall.sh ${{ matrix.BuildType }} + bash tools/uninstall.sh ${{ matrix.BuildType }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a5508e588..ef06da510 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -24,42 +24,42 @@ jobs: - name: Download dependencies shell: bash run: | - bash scripts/utils/download_dependencies.sh + bash tools/dev/download_dependencies.sh - name: Configure project shell: bash run: | - bash scripts/ci/configure_openmp.sh ${{ matrix.BuildType }} -DSTDGPU_BUILD_SHARED_LIBS=${{ matrix.SharedLibs }} -DSTDGPU_USE_32_BIT_INDEX=${{ matrix.Use32BitIndex }} -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE + bash tools/backend/configure_openmp.sh ${{ matrix.BuildType }} -DSTDGPU_BUILD_SHARED_LIBS=${{ matrix.SharedLibs }} -DSTDGPU_USE_32_BIT_INDEX=${{ matrix.Use32BitIndex }} -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE - name: Build project shell: bash run: | - bash scripts/build.sh ${{ matrix.BuildType }} + bash tools/build.sh ${{ matrix.BuildType }} - name: Run tests shell: bash run: | - bash scripts/run_tests.sh ${{ matrix.BuildType }} + bash tools/run_tests.sh ${{ matrix.BuildType }} - name: Verify headers shell: bash run: | - bash scripts/utils/verify_headers.sh + bash tools/dev/verify_headers.sh - name: Install project shell: bash run: | - bash scripts/install.sh ${{ matrix.BuildType }} + bash tools/install.sh ${{ matrix.BuildType }} - name: Check linking to installed project shell: bash run: | - bash scripts/ci/check_install_openmp.sh ${{ matrix.BuildType }} + bash tools/backend/check_install_openmp.sh ${{ matrix.BuildType }} - name: Uninstall project shell: bash run: | - bash scripts/uninstall.sh ${{ matrix.BuildType }} + bash tools/uninstall.sh ${{ matrix.BuildType }} Windows-2022: runs-on: windows-2022 @@ -76,39 +76,39 @@ jobs: - name: Download dependencies shell: bash run: | - bash scripts/utils/download_dependencies.sh + bash tools/dev/download_dependencies.sh - name: Configure project shell: bash run: | - bash scripts/ci/configure_openmp.sh ${{ matrix.BuildType }} -DSTDGPU_BUILD_SHARED_LIBS=${{ matrix.SharedLibs }} -DSTDGPU_USE_32_BIT_INDEX=${{ matrix.Use32BitIndex }} -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE + bash tools/backend/configure_openmp.sh ${{ matrix.BuildType }} -DSTDGPU_BUILD_SHARED_LIBS=${{ matrix.SharedLibs }} -DSTDGPU_USE_32_BIT_INDEX=${{ matrix.Use32BitIndex }} -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE - name: Build project shell: bash run: | - bash scripts/build.sh ${{ matrix.BuildType }} + bash tools/build.sh ${{ matrix.BuildType }} - name: Run tests shell: bash run: | - bash scripts/run_tests.sh ${{ matrix.BuildType }} + bash tools/run_tests.sh ${{ matrix.BuildType }} - name: Verify headers shell: bash run: | - bash scripts/utils/verify_headers.sh + bash tools/dev/verify_headers.sh - name: Install project shell: bash run: | - bash scripts/install.sh ${{ matrix.BuildType }} + bash tools/install.sh ${{ matrix.BuildType }} - name: Check linking to installed project shell: bash run: | - bash scripts/ci/check_install_openmp.sh ${{ matrix.BuildType }} + bash tools/backend/check_install_openmp.sh ${{ matrix.BuildType }} - name: Uninstall project shell: bash run: | - bash scripts/uninstall.sh ${{ matrix.BuildType }} + bash tools/uninstall.sh ${{ matrix.BuildType }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 10262f2aa..b8ceb6994 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -186,22 +186,21 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/add_uninstall_target.cmake") if(STDGPU_BUILD_EXAMPLES) - enable_testing() add_subdirectory(examples) endif() if(STDGPU_BUILD_BENCHMARKS) - add_subdirectory(benchmark) + add_subdirectory(benchmarks) endif() if(STDGPU_BUILD_TESTS) enable_testing() - add_subdirectory(test) + add_subdirectory(tests) if(STDGPU_BUILD_TEST_COVERAGE) setup_target_for_coverage(NAME stdgpu_coverage - EXECUTABLE ${CMAKE_COMMAND} -E chdir .. sh scripts/run_tests.sh ${CMAKE_BUILD_TYPE} + EXECUTABLE ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_SOURCE_DIR} sh tools/run_tests.sh ${CMAKE_BUILD_TYPE} DEPENDENCIES teststdgpu) endif() diff --git a/README.md b/README.md index 54e49e3df..5fd80a2da 100644 --- a/README.md +++ b/README.md @@ -234,11 +234,11 @@ In addition, we also provide cross-platform scripts to make the build process mo Command | Effect --- | --- -`bash scripts/setup.sh []` | Performs a full clean build of the project. Removes old build, configures the project (build path: `./build`, default build type: `Release`), builds the project, and runs the unit tests. -`bash scripts/build.sh []` | (Re-)Builds the project. Requires that the project is set up (default build type: `Release`). -`bash scripts/run_tests.sh []` | Runs the unit tests. Requires that the project is built (default build type: `Release`). -`bash scripts/install.sh []` | Installs the project to the configured install path (default install dir: `./bin`, default build type: `Release`). -`bash scripts/uninstall.sh []` | Uninstalls the project from the configured install path (default build type: `Release`). +`bash tools/setup.sh []` | Performs a full clean build of the project. Removes old build, configures the project (build path: `./build`, default build type: `Release`), builds the project, and runs the unit tests. +`bash tools/build.sh []` | (Re-)Builds the project. Requires that the project is set up (default build type: `Release`). +`bash tools/run_tests.sh []` | Runs the unit tests. Requires that the project is built (default build type: `Release`). +`bash tools/install.sh []` | Installs the project to the configured install path (default install dir: `./bin`, default build type: `Release`). +`bash tools/uninstall.sh []` | Uninstalls the project from the configured install path (default build type: `Release`). ## Integration diff --git a/STYLE_GUIDE.md b/STYLE_GUIDE.md index 37545172b..4c5d5668c 100644 --- a/STYLE_GUIDE.md +++ b/STYLE_GUIDE.md @@ -9,7 +9,7 @@ We use **C++17** throughout the project. Functionality from more recent C++ stan The source code is formatted according to a modified version of the Mozilla style guide that is specified in `.clang-format` and enforced by version **10** of `clang-format`. In order to automatically apply these rules to the source code, we provide the CMake targets `check_code_style` and `apply_code_style` as well as respective helper scripts: -- `scripts/utils/check_code_style.sh` -- `scripts/utils/apply_code_style.sh` +- `tools/dev/check_code_style.sh` +- `tools/dev/apply_code_style.sh` Note that other versions of `clang-format`, including more recent ones, may produce slightly different results which will also be considered non-conforming and, consequently, rejected. diff --git a/benchmark/CMakeLists.txt b/benchmarks/CMakeLists.txt similarity index 100% rename from benchmark/CMakeLists.txt rename to benchmarks/CMakeLists.txt diff --git a/benchmark/benchmark_utils.h b/benchmarks/benchmark_utils.h similarity index 100% rename from benchmark/benchmark_utils.h rename to benchmarks/benchmark_utils.h diff --git a/benchmark/stdgpu/CMakeLists.txt b/benchmarks/stdgpu/CMakeLists.txt similarity index 100% rename from benchmark/stdgpu/CMakeLists.txt rename to benchmarks/stdgpu/CMakeLists.txt diff --git a/benchmark/stdgpu/bitset.inc b/benchmarks/stdgpu/bitset.inc similarity index 100% rename from benchmark/stdgpu/bitset.inc rename to benchmarks/stdgpu/bitset.inc diff --git a/benchmark/stdgpu/cuda/CMakeLists.txt b/benchmarks/stdgpu/cuda/CMakeLists.txt similarity index 100% rename from benchmark/stdgpu/cuda/CMakeLists.txt rename to benchmarks/stdgpu/cuda/CMakeLists.txt diff --git a/benchmark/stdgpu/cuda/bitset.cu b/benchmarks/stdgpu/cuda/bitset.cu similarity index 100% rename from benchmark/stdgpu/cuda/bitset.cu rename to benchmarks/stdgpu/cuda/bitset.cu diff --git a/benchmark/stdgpu/cuda/deque.cu b/benchmarks/stdgpu/cuda/deque.cu similarity index 100% rename from benchmark/stdgpu/cuda/deque.cu rename to benchmarks/stdgpu/cuda/deque.cu diff --git a/benchmark/stdgpu/cuda/mutex.cu b/benchmarks/stdgpu/cuda/mutex.cu similarity index 100% rename from benchmark/stdgpu/cuda/mutex.cu rename to benchmarks/stdgpu/cuda/mutex.cu diff --git a/benchmark/stdgpu/cuda/unordered_map.cu b/benchmarks/stdgpu/cuda/unordered_map.cu similarity index 100% rename from benchmark/stdgpu/cuda/unordered_map.cu rename to benchmarks/stdgpu/cuda/unordered_map.cu diff --git a/benchmark/stdgpu/cuda/unordered_set.cu b/benchmarks/stdgpu/cuda/unordered_set.cu similarity index 100% rename from benchmark/stdgpu/cuda/unordered_set.cu rename to benchmarks/stdgpu/cuda/unordered_set.cu diff --git a/benchmark/stdgpu/cuda/vector.cu b/benchmarks/stdgpu/cuda/vector.cu similarity index 100% rename from benchmark/stdgpu/cuda/vector.cu rename to benchmarks/stdgpu/cuda/vector.cu diff --git a/benchmark/stdgpu/deque.inc b/benchmarks/stdgpu/deque.inc similarity index 100% rename from benchmark/stdgpu/deque.inc rename to benchmarks/stdgpu/deque.inc diff --git a/benchmark/stdgpu/hip/CMakeLists.txt b/benchmarks/stdgpu/hip/CMakeLists.txt similarity index 100% rename from benchmark/stdgpu/hip/CMakeLists.txt rename to benchmarks/stdgpu/hip/CMakeLists.txt diff --git a/benchmark/stdgpu/hip/bitset.hip b/benchmarks/stdgpu/hip/bitset.hip similarity index 100% rename from benchmark/stdgpu/hip/bitset.hip rename to benchmarks/stdgpu/hip/bitset.hip diff --git a/benchmark/stdgpu/hip/deque.hip b/benchmarks/stdgpu/hip/deque.hip similarity index 100% rename from benchmark/stdgpu/hip/deque.hip rename to benchmarks/stdgpu/hip/deque.hip diff --git a/benchmark/stdgpu/hip/mutex.hip b/benchmarks/stdgpu/hip/mutex.hip similarity index 100% rename from benchmark/stdgpu/hip/mutex.hip rename to benchmarks/stdgpu/hip/mutex.hip diff --git a/benchmark/stdgpu/hip/unordered_map.hip b/benchmarks/stdgpu/hip/unordered_map.hip similarity index 100% rename from benchmark/stdgpu/hip/unordered_map.hip rename to benchmarks/stdgpu/hip/unordered_map.hip diff --git a/benchmark/stdgpu/hip/unordered_set.hip b/benchmarks/stdgpu/hip/unordered_set.hip similarity index 100% rename from benchmark/stdgpu/hip/unordered_set.hip rename to benchmarks/stdgpu/hip/unordered_set.hip diff --git a/benchmark/stdgpu/hip/vector.hip b/benchmarks/stdgpu/hip/vector.hip similarity index 100% rename from benchmark/stdgpu/hip/vector.hip rename to benchmarks/stdgpu/hip/vector.hip diff --git a/benchmark/stdgpu/main.cpp b/benchmarks/stdgpu/main.cpp similarity index 100% rename from benchmark/stdgpu/main.cpp rename to benchmarks/stdgpu/main.cpp diff --git a/benchmark/stdgpu/mutex.inc b/benchmarks/stdgpu/mutex.inc similarity index 100% rename from benchmark/stdgpu/mutex.inc rename to benchmarks/stdgpu/mutex.inc diff --git a/benchmark/stdgpu/openmp/CMakeLists.txt b/benchmarks/stdgpu/openmp/CMakeLists.txt similarity index 100% rename from benchmark/stdgpu/openmp/CMakeLists.txt rename to benchmarks/stdgpu/openmp/CMakeLists.txt diff --git a/benchmark/stdgpu/openmp/bitset.cpp b/benchmarks/stdgpu/openmp/bitset.cpp similarity index 100% rename from benchmark/stdgpu/openmp/bitset.cpp rename to benchmarks/stdgpu/openmp/bitset.cpp diff --git a/benchmark/stdgpu/openmp/deque.cpp b/benchmarks/stdgpu/openmp/deque.cpp similarity index 100% rename from benchmark/stdgpu/openmp/deque.cpp rename to benchmarks/stdgpu/openmp/deque.cpp diff --git a/benchmark/stdgpu/openmp/mutex.cpp b/benchmarks/stdgpu/openmp/mutex.cpp similarity index 100% rename from benchmark/stdgpu/openmp/mutex.cpp rename to benchmarks/stdgpu/openmp/mutex.cpp diff --git a/benchmark/stdgpu/openmp/unordered_map.cpp b/benchmarks/stdgpu/openmp/unordered_map.cpp similarity index 100% rename from benchmark/stdgpu/openmp/unordered_map.cpp rename to benchmarks/stdgpu/openmp/unordered_map.cpp diff --git a/benchmark/stdgpu/openmp/unordered_set.cpp b/benchmarks/stdgpu/openmp/unordered_set.cpp similarity index 100% rename from benchmark/stdgpu/openmp/unordered_set.cpp rename to benchmarks/stdgpu/openmp/unordered_set.cpp diff --git a/benchmark/stdgpu/openmp/vector.cpp b/benchmarks/stdgpu/openmp/vector.cpp similarity index 100% rename from benchmark/stdgpu/openmp/vector.cpp rename to benchmarks/stdgpu/openmp/vector.cpp diff --git a/benchmark/stdgpu/unordered_datastructure.inc b/benchmarks/stdgpu/unordered_datastructure.inc similarity index 100% rename from benchmark/stdgpu/unordered_datastructure.inc rename to benchmarks/stdgpu/unordered_datastructure.inc diff --git a/benchmark/stdgpu/unordered_map.inc b/benchmarks/stdgpu/unordered_map.inc similarity index 100% rename from benchmark/stdgpu/unordered_map.inc rename to benchmarks/stdgpu/unordered_map.inc diff --git a/benchmark/stdgpu/unordered_set.inc b/benchmarks/stdgpu/unordered_set.inc similarity index 100% rename from benchmark/stdgpu/unordered_set.inc rename to benchmarks/stdgpu/unordered_set.inc diff --git a/benchmark/stdgpu/vector.inc b/benchmarks/stdgpu/vector.inc similarity index 100% rename from benchmark/stdgpu/vector.inc rename to benchmarks/stdgpu/vector.inc diff --git a/scripts/ci/configure_cuda.sh b/scripts/ci/configure_cuda.sh deleted file mode 100644 index e2cba6e30..000000000 --- a/scripts/ci/configure_cuda.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -e - -if [ "$#" = 0 ]; then - CONFIG="Release" -else - CONFIG=$1 - shift -fi - -# Create build directory -sh scripts/utils/create_empty_directory.sh build - -# Configure project -sh scripts/utils/configure.sh $CONFIG -DSTDGPU_BACKEND=STDGPU_BACKEND_CUDA -DSTDGPU_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_VERIFY_INTERFACE_HEADER_SETS=ON $@ diff --git a/scripts/ci/configure_hip.sh b/scripts/ci/configure_hip.sh deleted file mode 100644 index 0675293a3..000000000 --- a/scripts/ci/configure_hip.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -e - -if [ "$#" = 0 ]; then - CONFIG="Release" -else - CONFIG=$1 - shift -fi - -# Create build directory -sh scripts/utils/create_empty_directory.sh build - -# Configure project -sh scripts/utils/configure.sh $CONFIG -DSTDGPU_BACKEND=STDGPU_BACKEND_HIP -DSTDGPU_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_VERIFY_INTERFACE_HEADER_SETS=ON $@ diff --git a/scripts/ci/configure_openmp.sh b/scripts/ci/configure_openmp.sh deleted file mode 100644 index 0b9f14f96..000000000 --- a/scripts/ci/configure_openmp.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -e - -if [ "$#" = 0 ]; then - CONFIG="Release" -else - CONFIG=$1 - shift -fi - -# Create build directory -sh scripts/utils/create_empty_directory.sh build - -# Configure project -sh scripts/utils/configure.sh $CONFIG -DSTDGPU_BACKEND=STDGPU_BACKEND_OPENMP -DSTDGPU_COMPILE_WARNING_AS_ERROR=ON -Dthrust_ROOT=external/thrust -DCMAKE_VERIFY_INTERFACE_HEADER_SETS=ON $@ diff --git a/scripts/ci/configure_openmp_clang_tidy.sh b/scripts/ci/configure_openmp_clang_tidy.sh deleted file mode 100644 index 752d7d239..000000000 --- a/scripts/ci/configure_openmp_clang_tidy.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -e - -# Create build directory -sh scripts/utils/create_empty_directory.sh build - -# Configure project -sh scripts/utils/configure.sh Debug -DSTDGPU_BACKEND=STDGPU_BACKEND_OPENMP -DSTDGPU_ANALYZE_WITH_CLANG_TIDY=ON -DSTDGPU_COMPILE_WARNING_AS_ERROR=ON -Dthrust_ROOT=external/thrust diff --git a/scripts/ci/configure_openmp_cppcheck.sh b/scripts/ci/configure_openmp_cppcheck.sh deleted file mode 100644 index 99a6023ec..000000000 --- a/scripts/ci/configure_openmp_cppcheck.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -e - -# Create build directory -sh scripts/utils/create_empty_directory.sh build - -# Configure project -sh scripts/utils/configure.sh Debug -DSTDGPU_BACKEND=STDGPU_BACKEND_OPENMP -DSTDGPU_ANALYZE_WITH_CPPCHECK=ON -DSTDGPU_COMPILE_WARNING_AS_ERROR=ON -Dthrust_ROOT=external/thrust diff --git a/scripts/ci/configure_openmp_documentation.sh b/scripts/ci/configure_openmp_documentation.sh deleted file mode 100644 index 06c8b92bf..000000000 --- a/scripts/ci/configure_openmp_documentation.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -e - -# Create build directory -sh scripts/utils/create_empty_directory.sh build - -# Configure project -sh scripts/utils/configure.sh Release -DSTDGPU_BACKEND=STDGPU_BACKEND_OPENMP -DSTDGPU_BUILD_DOCUMENTATION=ON -DSTDGPU_COMPILE_WARNING_AS_ERROR=ON -Dthrust_ROOT=external/thrust diff --git a/scripts/ci/configure_openmp_lcov.sh b/scripts/ci/configure_openmp_lcov.sh deleted file mode 100644 index 95134edfc..000000000 --- a/scripts/ci/configure_openmp_lcov.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -e - -# Create build directory -sh scripts/utils/create_empty_directory.sh build - -# Configure project -sh scripts/utils/configure.sh Debug -DSTDGPU_BACKEND=STDGPU_BACKEND_OPENMP -DSTDGPU_BUILD_TEST_COVERAGE=ON -Dthrust_ROOT=external/thrust diff --git a/test/CMakeLists.txt b/tests/CMakeLists.txt similarity index 100% rename from test/CMakeLists.txt rename to tests/CMakeLists.txt diff --git a/test/install_test/CMakeLists.txt b/tests/install_test/CMakeLists.txt similarity index 100% rename from test/install_test/CMakeLists.txt rename to tests/install_test/CMakeLists.txt diff --git a/test/install_test/install_test.cpp b/tests/install_test/install_test.cpp similarity index 100% rename from test/install_test/install_test.cpp rename to tests/install_test/install_test.cpp diff --git a/test/stdgpu/CMakeLists.txt b/tests/stdgpu/CMakeLists.txt similarity index 100% rename from test/stdgpu/CMakeLists.txt rename to tests/stdgpu/CMakeLists.txt diff --git a/test/stdgpu/algorithm.cpp b/tests/stdgpu/algorithm.cpp similarity index 100% rename from test/stdgpu/algorithm.cpp rename to tests/stdgpu/algorithm.cpp diff --git a/test/stdgpu/atomic.inc b/tests/stdgpu/atomic.inc similarity index 100% rename from test/stdgpu/atomic.inc rename to tests/stdgpu/atomic.inc diff --git a/test/stdgpu/bit.cpp b/tests/stdgpu/bit.cpp similarity index 100% rename from test/stdgpu/bit.cpp rename to tests/stdgpu/bit.cpp diff --git a/test/stdgpu/bitset.inc b/tests/stdgpu/bitset.inc similarity index 100% rename from test/stdgpu/bitset.inc rename to tests/stdgpu/bitset.inc diff --git a/test/stdgpu/contract.cpp b/tests/stdgpu/contract.cpp similarity index 100% rename from test/stdgpu/contract.cpp rename to tests/stdgpu/contract.cpp diff --git a/test/stdgpu/cuda/CMakeLists.txt b/tests/stdgpu/cuda/CMakeLists.txt similarity index 100% rename from test/stdgpu/cuda/CMakeLists.txt rename to tests/stdgpu/cuda/CMakeLists.txt diff --git a/test/stdgpu/cuda/atomic.cu b/tests/stdgpu/cuda/atomic.cu similarity index 100% rename from test/stdgpu/cuda/atomic.cu rename to tests/stdgpu/cuda/atomic.cu diff --git a/test/stdgpu/cuda/bitset.cu b/tests/stdgpu/cuda/bitset.cu similarity index 100% rename from test/stdgpu/cuda/bitset.cu rename to tests/stdgpu/cuda/bitset.cu diff --git a/test/stdgpu/cuda/deque.cu b/tests/stdgpu/cuda/deque.cu similarity index 100% rename from test/stdgpu/cuda/deque.cu rename to tests/stdgpu/cuda/deque.cu diff --git a/test/stdgpu/cuda/memory.cu b/tests/stdgpu/cuda/memory.cu similarity index 100% rename from test/stdgpu/cuda/memory.cu rename to tests/stdgpu/cuda/memory.cu diff --git a/test/stdgpu/cuda/mutex.cu b/tests/stdgpu/cuda/mutex.cu similarity index 100% rename from test/stdgpu/cuda/mutex.cu rename to tests/stdgpu/cuda/mutex.cu diff --git a/test/stdgpu/cuda/unordered_map.cu b/tests/stdgpu/cuda/unordered_map.cu similarity index 100% rename from test/stdgpu/cuda/unordered_map.cu rename to tests/stdgpu/cuda/unordered_map.cu diff --git a/test/stdgpu/cuda/unordered_set.cu b/tests/stdgpu/cuda/unordered_set.cu similarity index 100% rename from test/stdgpu/cuda/unordered_set.cu rename to tests/stdgpu/cuda/unordered_set.cu diff --git a/test/stdgpu/cuda/vector.cu b/tests/stdgpu/cuda/vector.cu similarity index 100% rename from test/stdgpu/cuda/vector.cu rename to tests/stdgpu/cuda/vector.cu diff --git a/test/stdgpu/deque.inc b/tests/stdgpu/deque.inc similarity index 100% rename from test/stdgpu/deque.inc rename to tests/stdgpu/deque.inc diff --git a/test/stdgpu/functional.cpp b/tests/stdgpu/functional.cpp similarity index 100% rename from test/stdgpu/functional.cpp rename to tests/stdgpu/functional.cpp diff --git a/test/stdgpu/hip/CMakeLists.txt b/tests/stdgpu/hip/CMakeLists.txt similarity index 100% rename from test/stdgpu/hip/CMakeLists.txt rename to tests/stdgpu/hip/CMakeLists.txt diff --git a/test/stdgpu/hip/atomic.hip b/tests/stdgpu/hip/atomic.hip similarity index 100% rename from test/stdgpu/hip/atomic.hip rename to tests/stdgpu/hip/atomic.hip diff --git a/test/stdgpu/hip/bitset.hip b/tests/stdgpu/hip/bitset.hip similarity index 100% rename from test/stdgpu/hip/bitset.hip rename to tests/stdgpu/hip/bitset.hip diff --git a/test/stdgpu/hip/deque.hip b/tests/stdgpu/hip/deque.hip similarity index 100% rename from test/stdgpu/hip/deque.hip rename to tests/stdgpu/hip/deque.hip diff --git a/test/stdgpu/hip/memory.hip b/tests/stdgpu/hip/memory.hip similarity index 100% rename from test/stdgpu/hip/memory.hip rename to tests/stdgpu/hip/memory.hip diff --git a/test/stdgpu/hip/mutex.hip b/tests/stdgpu/hip/mutex.hip similarity index 100% rename from test/stdgpu/hip/mutex.hip rename to tests/stdgpu/hip/mutex.hip diff --git a/test/stdgpu/hip/unordered_map.hip b/tests/stdgpu/hip/unordered_map.hip similarity index 100% rename from test/stdgpu/hip/unordered_map.hip rename to tests/stdgpu/hip/unordered_map.hip diff --git a/test/stdgpu/hip/unordered_set.hip b/tests/stdgpu/hip/unordered_set.hip similarity index 100% rename from test/stdgpu/hip/unordered_set.hip rename to tests/stdgpu/hip/unordered_set.hip diff --git a/test/stdgpu/hip/vector.hip b/tests/stdgpu/hip/vector.hip similarity index 100% rename from test/stdgpu/hip/vector.hip rename to tests/stdgpu/hip/vector.hip diff --git a/test/stdgpu/iterator.cpp b/tests/stdgpu/iterator.cpp similarity index 100% rename from test/stdgpu/iterator.cpp rename to tests/stdgpu/iterator.cpp diff --git a/test/stdgpu/limits.cpp b/tests/stdgpu/limits.cpp similarity index 100% rename from test/stdgpu/limits.cpp rename to tests/stdgpu/limits.cpp diff --git a/test/stdgpu/main.cpp b/tests/stdgpu/main.cpp similarity index 100% rename from test/stdgpu/main.cpp rename to tests/stdgpu/main.cpp diff --git a/test/stdgpu/memory.cpp b/tests/stdgpu/memory.cpp similarity index 100% rename from test/stdgpu/memory.cpp rename to tests/stdgpu/memory.cpp diff --git a/test/stdgpu/memory.inc b/tests/stdgpu/memory.inc similarity index 100% rename from test/stdgpu/memory.inc rename to tests/stdgpu/memory.inc diff --git a/test/stdgpu/mutex.inc b/tests/stdgpu/mutex.inc similarity index 100% rename from test/stdgpu/mutex.inc rename to tests/stdgpu/mutex.inc diff --git a/test/stdgpu/numeric.cpp b/tests/stdgpu/numeric.cpp similarity index 100% rename from test/stdgpu/numeric.cpp rename to tests/stdgpu/numeric.cpp diff --git a/test/stdgpu/openmp/CMakeLists.txt b/tests/stdgpu/openmp/CMakeLists.txt similarity index 100% rename from test/stdgpu/openmp/CMakeLists.txt rename to tests/stdgpu/openmp/CMakeLists.txt diff --git a/test/stdgpu/openmp/atomic.cpp b/tests/stdgpu/openmp/atomic.cpp similarity index 100% rename from test/stdgpu/openmp/atomic.cpp rename to tests/stdgpu/openmp/atomic.cpp diff --git a/test/stdgpu/openmp/bitset.cpp b/tests/stdgpu/openmp/bitset.cpp similarity index 100% rename from test/stdgpu/openmp/bitset.cpp rename to tests/stdgpu/openmp/bitset.cpp diff --git a/test/stdgpu/openmp/deque.cpp b/tests/stdgpu/openmp/deque.cpp similarity index 100% rename from test/stdgpu/openmp/deque.cpp rename to tests/stdgpu/openmp/deque.cpp diff --git a/test/stdgpu/openmp/mutex.cpp b/tests/stdgpu/openmp/mutex.cpp similarity index 100% rename from test/stdgpu/openmp/mutex.cpp rename to tests/stdgpu/openmp/mutex.cpp diff --git a/test/stdgpu/openmp/unordered_map.cpp b/tests/stdgpu/openmp/unordered_map.cpp similarity index 100% rename from test/stdgpu/openmp/unordered_map.cpp rename to tests/stdgpu/openmp/unordered_map.cpp diff --git a/test/stdgpu/openmp/unordered_set.cpp b/tests/stdgpu/openmp/unordered_set.cpp similarity index 100% rename from test/stdgpu/openmp/unordered_set.cpp rename to tests/stdgpu/openmp/unordered_set.cpp diff --git a/test/stdgpu/openmp/vector.cpp b/tests/stdgpu/openmp/vector.cpp similarity index 100% rename from test/stdgpu/openmp/vector.cpp rename to tests/stdgpu/openmp/vector.cpp diff --git a/test/stdgpu/ranges.cpp b/tests/stdgpu/ranges.cpp similarity index 100% rename from test/stdgpu/ranges.cpp rename to tests/stdgpu/ranges.cpp diff --git a/test/stdgpu/unordered_datastructure.inc b/tests/stdgpu/unordered_datastructure.inc similarity index 100% rename from test/stdgpu/unordered_datastructure.inc rename to tests/stdgpu/unordered_datastructure.inc diff --git a/test/stdgpu/unordered_map.inc b/tests/stdgpu/unordered_map.inc similarity index 100% rename from test/stdgpu/unordered_map.inc rename to tests/stdgpu/unordered_map.inc diff --git a/test/stdgpu/unordered_set.inc b/tests/stdgpu/unordered_set.inc similarity index 100% rename from test/stdgpu/unordered_set.inc rename to tests/stdgpu/unordered_set.inc diff --git a/test/stdgpu/vector.inc b/tests/stdgpu/vector.inc similarity index 100% rename from test/stdgpu/vector.inc rename to tests/stdgpu/vector.inc diff --git a/test/test_memory_utils.cpp b/tests/test_memory_utils.cpp similarity index 100% rename from test/test_memory_utils.cpp rename to tests/test_memory_utils.cpp diff --git a/test/test_memory_utils.h b/tests/test_memory_utils.h similarity index 100% rename from test/test_memory_utils.h rename to tests/test_memory_utils.h diff --git a/test/test_memory_utils_detail.h b/tests/test_memory_utils_detail.h similarity index 100% rename from test/test_memory_utils_detail.h rename to tests/test_memory_utils_detail.h diff --git a/test/test_utils.h b/tests/test_utils.h similarity index 100% rename from test/test_utils.h rename to tests/test_utils.h diff --git a/scripts/ci/check_install_openmp.sh b/tools/backend/check_install_openmp.sh similarity index 85% rename from scripts/ci/check_install_openmp.sh rename to tools/backend/check_install_openmp.sh index 99dfe4ea8..25af7e9bf 100644 --- a/scripts/ci/check_install_openmp.sh +++ b/tools/backend/check_install_openmp.sh @@ -9,7 +9,7 @@ else fi # Create build directory -sh scripts/utils/create_empty_directory.sh build_install_test +sh tools/backend/helper/create_empty_directory.sh build_install_test # Compile dependent project cmake -E cmake_echo_color --blue ">>>>> Check installation ($CONFIG)" diff --git a/tools/backend/configure_cuda.sh b/tools/backend/configure_cuda.sh new file mode 100644 index 000000000..e493d7ff0 --- /dev/null +++ b/tools/backend/configure_cuda.sh @@ -0,0 +1,15 @@ +#!/bin/bash +set -e + +if [ "$#" = 0 ]; then + CONFIG="Release" +else + CONFIG=$1 + shift +fi + +# Create build directory +sh tools/backend/helper/create_empty_directory.sh build + +# Configure project +sh tools/backend/helper/configure.sh $CONFIG -DSTDGPU_BACKEND=STDGPU_BACKEND_CUDA -DSTDGPU_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_VERIFY_INTERFACE_HEADER_SETS=ON $@ diff --git a/tools/backend/configure_hip.sh b/tools/backend/configure_hip.sh new file mode 100644 index 000000000..533c3c483 --- /dev/null +++ b/tools/backend/configure_hip.sh @@ -0,0 +1,15 @@ +#!/bin/bash +set -e + +if [ "$#" = 0 ]; then + CONFIG="Release" +else + CONFIG=$1 + shift +fi + +# Create build directory +sh tools/backend/helper/create_empty_directory.sh build + +# Configure project +sh tools/backend/helper/configure.sh $CONFIG -DSTDGPU_BACKEND=STDGPU_BACKEND_HIP -DSTDGPU_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_VERIFY_INTERFACE_HEADER_SETS=ON $@ diff --git a/tools/backend/configure_openmp.sh b/tools/backend/configure_openmp.sh new file mode 100644 index 000000000..e1c07b781 --- /dev/null +++ b/tools/backend/configure_openmp.sh @@ -0,0 +1,15 @@ +#!/bin/bash +set -e + +if [ "$#" = 0 ]; then + CONFIG="Release" +else + CONFIG=$1 + shift +fi + +# Create build directory +sh tools/backend/helper/create_empty_directory.sh build + +# Configure project +sh tools/backend/helper/configure.sh $CONFIG -DSTDGPU_BACKEND=STDGPU_BACKEND_OPENMP -DSTDGPU_COMPILE_WARNING_AS_ERROR=ON -Dthrust_ROOT=external/thrust -DCMAKE_VERIFY_INTERFACE_HEADER_SETS=ON $@ diff --git a/tools/backend/configure_openmp_clang_tidy.sh b/tools/backend/configure_openmp_clang_tidy.sh new file mode 100644 index 000000000..d099ba158 --- /dev/null +++ b/tools/backend/configure_openmp_clang_tidy.sh @@ -0,0 +1,8 @@ +#!/bin/bash +set -e + +# Create build directory +sh tools/backend/helper/create_empty_directory.sh build + +# Configure project +sh tools/backend/helper/configure.sh Debug -DSTDGPU_BACKEND=STDGPU_BACKEND_OPENMP -DSTDGPU_ANALYZE_WITH_CLANG_TIDY=ON -DSTDGPU_COMPILE_WARNING_AS_ERROR=ON -Dthrust_ROOT=external/thrust diff --git a/tools/backend/configure_openmp_cppcheck.sh b/tools/backend/configure_openmp_cppcheck.sh new file mode 100644 index 000000000..aa014d1e2 --- /dev/null +++ b/tools/backend/configure_openmp_cppcheck.sh @@ -0,0 +1,8 @@ +#!/bin/bash +set -e + +# Create build directory +sh tools/backend/helper/create_empty_directory.sh build + +# Configure project +sh tools/backend/helper/configure.sh Debug -DSTDGPU_BACKEND=STDGPU_BACKEND_OPENMP -DSTDGPU_ANALYZE_WITH_CPPCHECK=ON -DSTDGPU_COMPILE_WARNING_AS_ERROR=ON -Dthrust_ROOT=external/thrust diff --git a/tools/backend/configure_openmp_documentation.sh b/tools/backend/configure_openmp_documentation.sh new file mode 100644 index 000000000..211244908 --- /dev/null +++ b/tools/backend/configure_openmp_documentation.sh @@ -0,0 +1,8 @@ +#!/bin/bash +set -e + +# Create build directory +sh tools/backend/helper/create_empty_directory.sh build + +# Configure project +sh tools/backend/helper/configure.sh Release -DSTDGPU_BACKEND=STDGPU_BACKEND_OPENMP -DSTDGPU_BUILD_DOCUMENTATION=ON -DSTDGPU_COMPILE_WARNING_AS_ERROR=ON -Dthrust_ROOT=external/thrust diff --git a/tools/backend/configure_openmp_lcov.sh b/tools/backend/configure_openmp_lcov.sh new file mode 100644 index 000000000..c6b88cf96 --- /dev/null +++ b/tools/backend/configure_openmp_lcov.sh @@ -0,0 +1,8 @@ +#!/bin/bash +set -e + +# Create build directory +sh tools/backend/helper/create_empty_directory.sh build + +# Configure project +sh tools/backend/helper/configure.sh Debug -DSTDGPU_BACKEND=STDGPU_BACKEND_OPENMP -DSTDGPU_BUILD_TEST_COVERAGE=ON -Dthrust_ROOT=external/thrust diff --git a/scripts/utils/configure.sh b/tools/backend/helper/configure.sh similarity index 100% rename from scripts/utils/configure.sh rename to tools/backend/helper/configure.sh diff --git a/scripts/utils/create_empty_directory.sh b/tools/backend/helper/create_empty_directory.sh similarity index 100% rename from scripts/utils/create_empty_directory.sh rename to tools/backend/helper/create_empty_directory.sh diff --git a/scripts/build.sh b/tools/build.sh similarity index 100% rename from scripts/build.sh rename to tools/build.sh diff --git a/scripts/utils/apply_code_style.sh b/tools/dev/apply_code_style.sh similarity index 100% rename from scripts/utils/apply_code_style.sh rename to tools/dev/apply_code_style.sh diff --git a/scripts/utils/build_documentation.sh b/tools/dev/build_documentation.sh similarity index 100% rename from scripts/utils/build_documentation.sh rename to tools/dev/build_documentation.sh diff --git a/scripts/utils/check_code_style.sh b/tools/dev/check_code_style.sh similarity index 100% rename from scripts/utils/check_code_style.sh rename to tools/dev/check_code_style.sh diff --git a/scripts/utils/download_dependencies.sh b/tools/dev/download_dependencies.sh similarity index 60% rename from scripts/utils/download_dependencies.sh rename to tools/dev/download_dependencies.sh index b0bd7b48a..1b0739d95 100644 --- a/scripts/utils/download_dependencies.sh +++ b/tools/dev/download_dependencies.sh @@ -3,7 +3,7 @@ set -e # Create external directory cmake -E cmake_echo_color --blue ">>>>> Download external dependencies" -sh scripts/utils/create_empty_directory.sh external +sh tools/backend/helper/create_empty_directory.sh external # Download thrust -sh scripts/utils/download_thrust.sh +sh tools/dev/download_thrust.sh diff --git a/scripts/utils/download_thrust.sh b/tools/dev/download_thrust.sh similarity index 100% rename from scripts/utils/download_thrust.sh rename to tools/dev/download_thrust.sh diff --git a/scripts/ci/run_coverage.sh b/tools/dev/run_coverage.sh similarity index 100% rename from scripts/ci/run_coverage.sh rename to tools/dev/run_coverage.sh diff --git a/scripts/utils/verify_headers.sh b/tools/dev/verify_headers.sh similarity index 100% rename from scripts/utils/verify_headers.sh rename to tools/dev/verify_headers.sh diff --git a/scripts/install.sh b/tools/install.sh similarity index 100% rename from scripts/install.sh rename to tools/install.sh diff --git a/scripts/run_tests.sh b/tools/run_tests.sh similarity index 100% rename from scripts/run_tests.sh rename to tools/run_tests.sh diff --git a/scripts/setup.sh b/tools/setup.sh similarity index 68% rename from scripts/setup.sh rename to tools/setup.sh index 53e4d7435..8e13a2d78 100644 --- a/scripts/setup.sh +++ b/tools/setup.sh @@ -14,13 +14,13 @@ else fi # Create build directory -sh scripts/utils/create_empty_directory.sh build +sh tools/backend/helper/create_empty_directory.sh build # Configure project -sh scripts/utils/configure.sh $CONFIG +sh tools/backend/helper/configure.sh $CONFIG # Build project -sh scripts/build.sh $CONFIG +sh tools/build.sh $CONFIG # Run tests -sh scripts/run_tests.sh $CONFIG +sh tools/run_tests.sh $CONFIG diff --git a/scripts/utils/install_clang_format_ubuntu2004.sh b/tools/ubuntu/install_clang_format.sh similarity index 100% rename from scripts/utils/install_clang_format_ubuntu2004.sh rename to tools/ubuntu/install_clang_format.sh diff --git a/scripts/utils/install_clang_tidy_ubuntu.sh b/tools/ubuntu/install_clang_tidy.sh similarity index 100% rename from scripts/utils/install_clang_tidy_ubuntu.sh rename to tools/ubuntu/install_clang_tidy.sh diff --git a/scripts/utils/install_cppcheck_ubuntu.sh b/tools/ubuntu/install_cppcheck.sh similarity index 100% rename from scripts/utils/install_cppcheck_ubuntu.sh rename to tools/ubuntu/install_cppcheck.sh diff --git a/scripts/utils/install_docs_dependencies_ubuntu.sh b/tools/ubuntu/install_docs_dependencies.sh similarity index 100% rename from scripts/utils/install_docs_dependencies_ubuntu.sh rename to tools/ubuntu/install_docs_dependencies.sh diff --git a/scripts/utils/install_lcov_ubuntu.sh b/tools/ubuntu/install_lcov.sh similarity index 100% rename from scripts/utils/install_lcov_ubuntu.sh rename to tools/ubuntu/install_lcov.sh diff --git a/scripts/utils/install_openmp_ubuntu.sh b/tools/ubuntu/install_openmp.sh similarity index 100% rename from scripts/utils/install_openmp_ubuntu.sh rename to tools/ubuntu/install_openmp.sh diff --git a/scripts/utils/set_cxx_compiler_ubuntu.sh b/tools/ubuntu/set_cxx_compiler.sh similarity index 79% rename from scripts/utils/set_cxx_compiler_ubuntu.sh rename to tools/ubuntu/set_cxx_compiler.sh index a57fc4792..a3fd08e09 100644 --- a/scripts/utils/set_cxx_compiler_ubuntu.sh +++ b/tools/ubuntu/set_cxx_compiler.sh @@ -3,7 +3,7 @@ set -e # Check number of input parameters if [ "$#" -ne 2 ]; then - cmake -E echo "set_cxx_compiler_ubuntu: Expected 2 parameters, but received $# parameters" + cmake -E echo "set_cxx_compiler: Expected 2 parameters, but received $# parameters" exit 1 fi diff --git a/scripts/uninstall.sh b/tools/uninstall.sh similarity index 100% rename from scripts/uninstall.sh rename to tools/uninstall.sh