Merge branch 'master' into numpy2

Author: dbogdanov

FAQ.md

@@ -230,7 +230,7 @@ The most important test is the basetest, it should never fail:
 ./build/basetest
 ```
 
-Run all Python tests:
+Run all Python tests (all Essentia algorithms, including based on TensorFlow):
 ```
 python3 waf run_python_tests
 ```

pyproject-tensorflow.toml

@@ -4,8 +4,8 @@ manylinux-x86_64-image = "mtgupf/essentia-builds:manylinux2014_x86_64"
 
 # Only support x86_64 for essentia-tensorflow
 build = "cp**-manylinux_x86_64"
-# TODO: skipping Python 3.12 for now until we create manylinux images supporting this version.
-skip = ["pp*", "*-musllinux*", "*i686", "*cp312*"]
+
+skip = ["pp*", "*-musllinux*", "*i686", "*cp36*", "*cp37*", "*cp38*"]
 
 environment = { PROJECT_NAME="essentia-tensorflow", ESSENTIA_PROJECT_NAME="${PROJECT_NAME}", ESSENTIA_WHEEL_SKIP_3RDPARTY=1, ESSENTIA_WHEEL_ONLY_PYTHON=1 }
 

pyproject.toml

@@ -4,7 +4,6 @@
 manylinux-x86_64-image = "mtgupf/essentia-builds:manylinux2014_x86_64"
 manylinux-i686-image = "mtgupf/essentia-builds:manylinux2014_i686"
 
-# TODO: skipping Python 3.12 for now until we create manylinux images supporting this version.
 skip = ["pp*", "*-musllinux*", "*i686", "*cp36*", "*cp37*", "*cp38*"]
 
 environment = { PROJECT_NAME="essentia", ESSENTIA_PROJECT_NAME="${PROJECT_NAME}", ESSENTIA_WHEEL_SKIP_3RDPARTY=1, ESSENTIA_WHEEL_ONLY_PYTHON=1 }

src/algorithms/highlevel/chromaprinter.cpp

@@ -54,7 +54,7 @@ void Chromaprinter::compute() {
   // Copy the signal to new vector to expand it to the int16_t dynamic range before the cast.
   std::vector<Real> signalScaled = signal;
   std::transform(signalScaled.begin(), signalScaled.end(), signalScaled.begin(),
-                 std::bind1st(std::multiplies<Real>(), pow(2,15)));
+                 std::bind(std::multiplies<Real>(), pow(2,15), std::placeholders::_1));
 
   std::vector<int16_t> signalCast(signalScaled.begin(), signalScaled.end());
 
@@ -160,7 +160,7 @@ AlgorithmStatus Chromaprinter::process() {
     // Copy the signal to new vector to expand it to the int16_t dynamic range before the cast.
     std::vector<Real> signalScaled = signal;
     std::transform(signalScaled.begin(), signalScaled.end(), signalScaled.begin(),
-                   std::bind1st(std::multiplies<Real>(), pow(2,15)));
+                   std::bind(std::multiplies<Real>(), pow(2,15), std::placeholders::_1));
 
     std::vector<int16_t> signalCast(signalScaled.begin(), signalScaled.end());
 

src/essentia/essentiamath.h

@@ -914,7 +914,7 @@ std::vector<T> derivative(const std::vector<T>& array) {
 }
 
 template<typename T, typename U, typename Comparator=std::greater<T> >
-class PairCompare : public std::binary_function<T, U, bool> {
+class PairCompare {
   Comparator _cmp;
   public:
     bool operator () (const std::pair<T,U>& p1, const std::pair<T,U>& p2) const {

src/essentia/types.h

@@ -115,8 +115,7 @@ inline bool case_insensitive_char_cmp(char a, char b) {
 /**
  * Function object for comparing two strings in a case-insensitive manner.
  */
-struct case_insensitive_str_cmp
-  : public std::binary_function<const std::string&, const std::string&, bool> {
+struct case_insensitive_str_cmp {
   bool operator()(const std::string& str1, const std::string& str2) const {
     return std::lexicographical_compare(str1.begin(), str1.end(),
                                         str2.begin(), str2.end(),

src/essentia/utils/peak.h

@@ -71,7 +71,7 @@ class Peak {
 // the positions are equal it sorts by descending magnitude
 template<typename Comp1=std::less<Real>,
          typename Comp2=std::greater_equal<Real> >
-class ComparePeakPosition : public std::binary_function<Real, Real, bool> {
+class ComparePeakPosition {
   Comp1 _cmp1;
   Comp2 _cmp2;
   public:
@@ -86,7 +86,7 @@ class ComparePeakPosition : public std::binary_function<Real, Real, bool> {
 // the magnitudes are equal it sorts by ascending position
 template<typename Comp1=std::greater<Real>,
          typename Comp2=std::less_equal<Real> >
-class ComparePeakMagnitude : public std::binary_function<Real, Real, bool> {
+class ComparePeakMagnitude {
   Comp1 _cmp1;
   Comp2 _cmp2;
   public: