diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml new file mode 100644 index 0000000..c3de66c --- /dev/null +++ b/.github/workflows/cmake-multi-platform.yml @@ -0,0 +1,74 @@ +# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform. +# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml +name: CMake on multiple platforms + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + runs-on: ${{ matrix.os }} + + strategy: + # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable. + fail-fast: false + + # Set up a matrix to run the following 3 configurations: + # 1. + # 2. + # 3. + # + # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list. + matrix: + build_type: [Release] + os: [ubuntu-latest] + c_compiler: [gcc, clang] + include: + - os: ubuntu-latest + c_compiler: gcc + cpp_compiler: g++ + - os: ubuntu-latest + c_compiler: clang + cpp_compiler: clang++ + + steps: + - uses: actions/checkout@v4 + + - name: Set reusable strings + # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file. + id: strings + shell: bash + run: | + echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT" + + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: > + cmake -B ${{ steps.strings.outputs.build-output-dir }} + -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} + -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} + -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} + -DENABLE_AVX2=ON + -S ${{ github.workspace }} + + - name: Build + # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). + run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} + + - name: Test + working-directory: ${{ steps.strings.outputs.build-output-dir }} + # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). + # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail + run: ctest --build-config ${{ matrix.build_type }} + - name: Upload a Build Artifact + uses: actions/upload-artifact@v4.6.2 + with: + name: sac + path: ./build/ + if-no-files-found: warn + overwrite: true + include-hidden-files: false diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..c96e2e7 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,41 @@ +cmake_minimum_required(VERSION 3.14) +project(sac LANGUAGES CXX) + +set(CMAKE_CXX_STANDARD 23) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS OFF) + +file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS src/*.cpp) + +add_executable(sac ${SOURCES}) + +option(ENABLE_AVX2 "AVX2/FMA" OFF) +option(ENABLE_AVX512 "AVX512" OFF) + +if(ENABLE_AVX512) + target_compile_options(sac PRIVATE + -mavx512f + -mavx512dq + -mavx512bw + -mavx512vl + -mfma + -O3 + ) + target_compile_definitions(sac PRIVATE USE_AVX512=1) +elseif(ENABLE_AVX2) + target_compile_options(sac PRIVATE + -mavx2 + -mfma + -O3 + ) + target_compile_definitions(sac PRIVATE USE_AVX256=1) +else() + target_compile_options(sac PRIVATE + -O3 + ) + target_compile_definitions(sac PRIVATE) +endif() + +target_link_libraries(sac PRIVATE stdc++) + +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) diff --git a/src/common/alignbuf.h b/src/common/alignbuf.h index df0a85c..a5cb601 100644 --- a/src/common/alignbuf.h +++ b/src/common/alignbuf.h @@ -23,7 +23,7 @@ struct align_alloc { } void deallocate(T* p, std::size_t n) noexcept { - ::operator delete(p, n * sizeof(T), std::align_val_t(align_t)); + ::operator delete(p, std::align_val_t(align_t)); } }; diff --git a/src/common/md5.h b/src/common/md5.h index f61d72e..40a73ea 100644 --- a/src/common/md5.h +++ b/src/common/md5.h @@ -1,6 +1,7 @@ #ifndef MD5_H #define MD5_H +#include #include namespace MD5 { diff --git a/src/common/utils.h b/src/common/utils.h index 6d42b9d..76d5a37 100644 --- a/src/common/utils.h +++ b/src/common/utils.h @@ -5,10 +5,11 @@ #include "math.h" #include -#include #include #include +#include #include +#include // running exponential smoothing // sum=alpha*sum+(1.0-alpha)*val, where 1/(1-alpha) is the mean number of samples considered