Merge pull request #28 from bab2min/dev

implemented (#24), fixed (#27)
bab2min · Jul 16, 2021 · 739b95a · 739b95a
2 parents 111e688 + 7fc41db
commit 739b95a
Show file tree

Hide file tree

Showing 30 changed files with 3,021 additions and 1,156 deletions.
diff --git a/.github/workflows/pull_request_test.yml b/.github/workflows/pull_request_test.yml
@@ -26,20 +26,20 @@ jobs:
         mv eigen include
     - name: Build Bench
       run: |
-        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes test/benchmark.cpp -o bench.out
+        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes benchmark/benchmark.cpp -o bench.out
     - name: Run Bench
       run: |
         cat /proc/cpuinfo
         ./bench.out
     - name: Build BenchMv
       run: |
-        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes test/benchmark_mv.cpp -o benchmv.out
+        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes benchmark/benchmark_mv.cpp -o benchmv.out
     - name: Run BenchMv
       run: |
         ./benchmv.out
     - name: Build Accuracy
       run: |
-        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes test/accuracy.cpp -o accuracy.out
+        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes benchmark/accuracy.cpp -o accuracy.out
     - name: Run Accuracy
       run: |
         ./accuracy.out
@@ -61,22 +61,22 @@ jobs:
         mv eigen-${{ matrix.eigenversion }} include
     - name: Build Bench
       run: |
-        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes test/benchmark.cpp -o bench.out
+        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes benchmark/benchmark.cpp -o bench.out
     - name: Run Bench
       continue-on-error: true
       run: |
         sysctl -a | grep machdep.cpu
         ./bench.out
     - name: Build BenchMv
       run: |
-        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes test/benchmark_mv.cpp -o benchmv.out
+        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes benchmark/benchmark_mv.cpp -o benchmv.out
     - name: Run BenchMv
       continue-on-error: true
       run: |
         ./benchmv.out
     - name: Build Accuracy
       run: |
-        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes test/accuracy.cpp -o accuracy.out
+        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes benchmark/accuracy.cpp -o accuracy.out
     - name: Run Accuracy
       run: |
         ./accuracy.out
@@ -99,20 +99,20 @@ jobs:
     - uses: ilammy/msvc-dev-cmd@v1
     - name: Build Bench
       run: |
-        cl.exe /O2 ${{ matrix.arch }} /I.\ /I.\include /D "NDEBUG" /Fe:bench.exe .\test\benchmark.cpp
+        cl.exe /O2 ${{ matrix.arch }} /I.\ /I.\include /D "NDEBUG" /Fe:bench.exe .\benchmark\benchmark.cpp
     - name: Run Bench
       run: |
         bash -c "cat /proc/cpuinfo"
         .\bench.exe
     - name: Build BenchMv
       run: |
-        cl.exe /O2 ${{ matrix.arch }} /I.\ /I.\include /D "NDEBUG" /Fe:benchmv.exe .\test\benchmark_mv.cpp
+        cl.exe /O2 ${{ matrix.arch }} /I.\ /I.\include /D "NDEBUG" /Fe:benchmv.exe .\benchmark\benchmark_mv.cpp
     - name: Run BenchMv
       run: |
         .\benchmv.exe
     - name: Build Accuracy
       run: |
-        cl.exe /O2 ${{ matrix.arch }} /I.\ /I.\include /D "NDEBUG" /Fe:accuracy.exe .\test\accuracy.cpp
+        cl.exe /O2 ${{ matrix.arch }} /I.\ /I.\include /D "NDEBUG" /Fe:accuracy.exe .\benchmark\accuracy.cpp
     - name: Run Accuracy
       run: |
         .\accuracy.exe
@@ -134,4 +134,4 @@ jobs:
     - name: Test Reference
       run: |
         pip install scipy
-        python test/comp_scipy.py
+        python benchmark/comp_scipy.py
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,18 +33,18 @@ jobs:
     - name: Test Reference
       run: |
         pip install scipy
-        python test/comp_scipy.py
+        python benchmark/comp_scipy.py
     - name: Build Bench
       run: |
-        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes test/benchmark.cpp -o bench.out
+        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes benchmark/benchmark.cpp -o bench.out
     - name: Run Bench
       run: |
         cat /proc/cpuinfo
         g++ -v
         ./bench.out
     - name: Build BenchMv
       run: |
-        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes test/benchmark_mv.cpp -o benchmv.out
+        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes benchmark/benchmark_mv.cpp -o benchmv.out
     - name: Run BenchMv
       run: |
         ./benchmv.out
@@ -72,10 +72,10 @@ jobs:
     - name: Test Reference
       run: |
         pip install scipy
-        python test/comp_scipy.py
+        python benchmark/comp_scipy.py
     - name: Build Bench
       run: |
-        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes test/benchmark.cpp -o bench.out
+        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes benchmark/benchmark.cpp -o bench.out
     - name: Run Bench
       continue-on-error: true
       run: |
@@ -84,7 +84,7 @@ jobs:
         ./bench.out
     - name: Build BenchMv
       run: |
-        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes test/benchmark_mv.cpp -o benchmv.out
+        g++ -std=c++11 -g -O3 -${{ matrix.arch }} -DNDEBUG -I./ -I./include -Wno-ignored-attributes benchmark/benchmark_mv.cpp -o benchmv.out
     - name: Run BenchMv
       continue-on-error: true
       run: |
@@ -113,18 +113,18 @@ jobs:
     - name: Test Reference
       run: |
         pip install scipy
-        python test/comp_scipy.py
+        python benchmark/comp_scipy.py
     - uses: ilammy/msvc-dev-cmd@v1
     - name: Build Bench
       run: |
-        cl.exe /O2 ${{ matrix.arch }} /I.\ /I.\include /D "NDEBUG" /Fe:bench.exe .\test\benchmark.cpp
+        cl.exe /O2 ${{ matrix.arch }} /I.\ /I.\include /D "NDEBUG" /Fe:bench.exe .\benchmark\benchmark.cpp
     - name: Run Bench
       run: |
         bash -c "cat /proc/cpuinfo"
         .\bench.exe
     - name: Build BenchMv
       run: |
-        cl.exe /O2 ${{ matrix.arch }} /I.\ /I.\include /D "NDEBUG" /Fe:benchmv.exe .\test\benchmark_mv.cpp
+        cl.exe /O2 ${{ matrix.arch }} /I.\ /I.\include /D "NDEBUG" /Fe:benchmv.exe .\benchmark\benchmark_mv.cpp
     - name: Run BenchMv
       run: |
         .\benchmv.exe
@@ -146,4 +146,4 @@ jobs:
     - name: Test Reference
       run: |
         pip install scipy
-        python test/comp_scipy.py
+        python benchmark/comp_scipy.py