Changed build rules

Author: thomas-risse

src/maxmsp/1dSAV/source/projects/1dSAV.CubicString/CMakeLists.txt

@@ -1,6 +1,3 @@
-# Copyright 2018 The Min-DevKit Authors. All rights reserved.
-# Use of this source code is governed by the MIT License found in the License.md file.
-
 cmake_minimum_required(VERSION 3.10)
 
 set(C74_MIN_API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../min-api)
@@ -50,8 +47,17 @@ target_link_libraries(
 include(${C74_MIN_API_DIR}/script/min-posttarget.cmake)
 
 
-#############################################################
-# UNIT TEST
-#############################################################
-
-include(${C74_MIN_API_DIR}/test/min-object-unittest.cmake)
+# Optimisation flags
+if(NOT MSVC)
+	target_compile_options(${PROJECT_NAME} PRIVATE
+			-O3
+			-march=native
+			-ffast-math
+			-funroll-loops
+			-fno-omit-frame-pointer
+	)
+	target_compile_definitions(${PROJECT_NAME} PRIVATE
+			EIGEN_NO_DEBUG
+			EIGEN_DONT_PARALLELIZE
+	)
+endif()

src/processor/StringProcessor.cpp

@@ -286,30 +286,30 @@ std::tuple<T, T, T> StringProcessor<T>::process(T input, T bend, T posex,
                                                 T t60_0)
 {
   // Eigen::internal::set_is_malloc_allowed(false);
-  //  Pitch bend
-  // if (bend != this->bend)
-  // {
-  //   this->bend = bend;
-  //   modifyhFromBend();
-  //   updateCoefficients();
-  // }
-  // // Excitation and listening positions
-  // if (posex != this->posex || poslistL != this->poslistL ||
-  //     poslistR != this->poslistR)
-  // {
-  //   this->posex = std::clamp(posex, T(0), T(1));
-  //   this->poslistL = std::clamp(poslistL, T(0), T(1));
-  //   this->poslistR = std::clamp(poslistR, T(0), T(1));
-  // }
-  // // Modify damping from t60_0. Only eta_0 is modified to preserve stability.
-  // // F60_0 is considered to be zero here.
-  // if (t60_0 != this->t60_0 && t60_0 > 1e-4)
-  // {
-  //   this->t60_0 = t60_0;
-  //   this->eta_0 = 3 * log(10) / (t60_0);
-
-  //   updateCoefficients();
-  // }
+  // Pitch bend
+  if (bend != this->bend)
+  {
+    this->bend = bend;
+    modifyhFromBend();
+    updateCoefficients();
+  }
+  // Excitation and listening positions
+  if (posex != this->posex || poslistL != this->poslistL ||
+      poslistR != this->poslistR)
+  {
+    this->posex = std::clamp(posex, T(0), T(1));
+    this->poslistL = std::clamp(poslistL, T(0), T(1));
+    this->poslistR = std::clamp(poslistR, T(0), T(1));
+  }
+  // Modify damping from t60_0. Only eta_0 is modified to preserve stability.
+  // F60_0 is considered to be zero here.
+  if (t60_0 != this->t60_0 && t60_0 > 1e-4)
+  {
+    this->t60_0 = t60_0;
+    this->eta_0 = 3 * log(10) / (t60_0);
+
+    updateCoefficients();
+  }
 
   // Compute g (dependant on the nonlinear mode => value of nl)
   computeVAndVprime();

src/processor/StringProcessor.h

@@ -42,7 +42,7 @@ class StringProcessor
   Eigen::Vector<T, -1> qlast, qnow, qnext;
 
   // Intermediary variables
-  double A0_inv;
+  T A0_inv;
 
   // Excitation and listening positions
   T posex{0}, poslistL{0}, poslistR{0};

src/timing/CMakeLists.txt

@@ -33,5 +33,19 @@ target_link_libraries(
 	Eigen3::Eigen
 )
 
-
-target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
+target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
+
+# Optimisation flags
+if(NOT MSVC)
+	target_compile_options(${PROJECT_NAME} PRIVATE
+			-O3
+			-march=native
+			-ffast-math
+			-funroll-loops
+			-fno-omit-frame-pointer
+	)
+	target_compile_definitions(${PROJECT_NAME} PRIVATE
+			EIGEN_NO_DEBUG
+			EIGEN_DONT_PARALLELIZE
+	)
+endif()