commit 6f482b7974dcba5042b6dfce7db6453223fda80e
parent d90e46849e0008c944deec8d019f352344263a96
Author: David Freifeld <freifeld.david@gmail.com>
Date: Tue, 11 Aug 2020 17:04:27 -0700
Various tweaks
Diffstat:
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/macos-latest.yml b/.github/workflows/macos-latest.yml
@@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: install
- run: git clone https://gitlab.com/libeigen/eigen.git && cd eigen && cp -R Eigen /usr/local/include/ && cd ..
+ run: git clone https://gitlab.com/libeigen/eigen.git && cd eigen && cp -R Eigen /usr/local/include/ && cd .. && gcc -x c++ -v -E /dev/null
# python 3 -m pip install pytest
# git clone https://github.com/pybind/pybind11.git
# mkdir build
diff --git a/.github/workflows/ubuntu-latest.yml b/.github/workflows/ubuntu-latest.yml
@@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: install
- run: git clone https://gitlab.com/libeigen/eigen.git && cd eigen && cp -R Eigen /usr/local/include/ && cd ..
+ run: git clone https://gitlab.com/libeigen/eigen.git && cd eigen && cp -R Eigen /usr/local/include/ && cd .. && gcc -x c++ -v -E /dev/null
# python 3 -m pip install pytest
# git clone https://github.com/pybind/pybind11.git
# mkdir build
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,12 +5,11 @@ set(CMAKE_CXX_COMPILER "g++")
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(COMPILE_FLAGS, "-w")
-# if (DEBUG)
-# set(COMPILE_FLAGS, "-Wall")
-# else()
-# set(COMPILE_FLAGS, "-w")
-# endif()
+if (DEBUG)
+ set(COMPILE_FLAGS, "-Wall")
+else()
+ set(COMPILE_FLAGS, "-w")
+endif()
if (FAST)
set(COMPILE_FLAGS "${COMPILE_FLAGS} -O3")
@@ -40,8 +39,4 @@ endif (PYTHON)
if (CXX)
project(jacobian_cli)
add_executable(jacobian_cli example.cpp ./src/bpnn.cpp ./src/utils.cpp)
- enable_testing()
- add_test(NAME "Valid run" COMMAND jacobian_cli 16 50)
- add_test(NAME "Large batch" COMMAND jacobian_cli 1000 50)
- add_test(NAME "Small batch" COMMAND jacobian_cli 1 50)
endif (CXX)
diff --git a/readme.md b/readme.md
@@ -90,6 +90,8 @@ Note: This is all ideally the process for manual building, but it's so confusing
### Building with CMake
+**Don't forget to delete `CMakeCache.txt` after each compilation if you plan on switching things up!**
+
There are two target languages, five main build configurations, and a number of toggleable build 'attributes'. The preferred target language can be specified by setting a CMake variable from the command-line: `-DCXX=ON` or `-DPYTHON=ON`.
The five main configurations correspond to differing levels of optimization.