Changeset d1d4ad4

Timestamp:

Nov 21, 2018, 1:00:47 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/constantq

Children:

f87e191

Parents:

c03d191 (diff), 5eea3b2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feature/constantq

Files:

• .appveyor.yml (modified) (3 diffs)
• python/ext/py-filterbank.c (modified) (3 diffs)
• python/ext/py-source.c (modified) (1 diff)
• python/lib/gen_external.py (modified) (1 diff)
• python/tests/test_mfcc.py (modified) (1 diff)
• scripts/get_waf.sh (modified) (1 diff)

.appveyor.yml

@@ -3 +3 @@
 
 environment:
-
-  global:
-      CUSTOM64PATH: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin
 
   matrix:
@@ -44 +41 @@
 
 install:
-
   - ECHO "Installed SDKs:"
   - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""
 
   - "SET PATH=%PYTHONDIR%;%PYTHONDIR%\\Scripts;%PATH%"
-
-  - if [%PYTHON_ARCH%]==[64] SET PATH=%CUSTOM64PATH%;%PATH%
 
   # Check that we have the expected version and architecture for Python
@@ -72 +66 @@
   # clean before building python package
   - python waf distclean
-  # build python module without using libaubio
-  - pip wheel -v -v -v --wheel-dir=dist .
   # build, upload and install wheel (inspired by numpy's appveyor)
   - ps: |

python/ext/py-filterbank.c

@@ -123 +123 @@
 
   PyObject *input;
-  uint_t samplerate;
-  if (!PyArg_ParseTuple (args, "OI", &input, &samplerate)) {
+  smpl_t samplerate;
+  if (!PyArg_ParseTuple (args, "O" AUBIO_NPY_SMPL_CHR, &input, &samplerate)) {
     return NULL;
   }
@@ -269 +269 @@
 Py_filterbank_set_power(Py_filterbank *self, PyObject *args)
 {
-  uint_t power;
-
-  if (!PyArg_ParseTuple (args, "I", &power)) {
+  smpl_t power;
+
+  if (!PyArg_ParseTuple (args, AUBIO_NPY_SMPL_CHR, &power)) {
     return NULL;
   }
@@ -292 +292 @@
 Py_filterbank_set_norm(Py_filterbank *self, PyObject *args)
 {
-  uint_t playing;
-
-  if (!PyArg_ParseTuple (args, "I", &playing)) {
-    return NULL;
-  }
-  if(aubio_filterbank_set_norm (self->o, playing)) {
+  smpl_t norm;
+
+  if (!PyArg_ParseTuple (args, AUBIO_NPY_SMPL_CHR, &norm)) {
+    return NULL;
+  }
+  if(aubio_filterbank_set_norm (self->o, norm)) {
     if (PyErr_Occurred() == NULL) {
       PyErr_SetString (PyExc_ValueError,

python/ext/py-source.c

@@ -156 +156 @@
 "...         n_frames += len(samples)\n"
 "...     print('read', n_frames, 'samples in', samples.shape[0], 'channels',\n"
-"...         'from file \"\%s\"' \% source.uri)\n"
+"...         'from file \"%%s\"' %% source.uri)\n"
 "...\n"
 "read 239334 samples in 2 channels from file \"audiotrack.wav\"\n"

python/lib/gen_external.py

@@ -75 +75 @@
         cpp_cmd += ['-E']
 
+    # On win-amd64 (py3.x), the default compiler is cross-compiling, from x86
+    # to amd64 with %WIN_SDK_ROOT%\x86_amd64\cl.exe, but using this binary as a
+    # pre-processor generates no output, so we use %WIN_SDK_ROOT%\cl.exe
+    # instead.
+    if len(cpp_cmd) > 1 and 'cl.exe' in cpp_cmd[-2]:
+        plat = os.path.basename(os.path.dirname(cpp_cmd[-2]))
+        if plat == 'x86_amd64':
+            print('workaround on win64 to avoid empty pre-processor output')
+            cpp_cmd[-2] = cpp_cmd[-2].replace('x86_amd64', '')
+        elif True in ['amd64' in f for f in cpp_cmd]:
+            print('warning: not using workaround for', cpp_cmd[0], plat)
+
     if not cpp_cmd:
         print("Warning: could not guess preprocessor, using env's CC")

python/tests/test_mfcc.py

@@ -141 +141 @@
         buf_size, n_filters, n_coeffs, samplerate = 512, 40, 10, 16000
         m = mfcc(buf_size, n_filters, n_coeffs, samplerate)
-        m.set_mel_coeffs_slaney(samplerate)
+        m.set_mel_coeffs_slaney()
         m(cvec(buf_size))
         assert m.get_power() == 1

scripts/get_waf.sh

@@ -4 +4 @@
 #set -x
 
-WAFVERSION=2.0.11
+WAFVERSION=2.0.12
 WAFTARBALL=waf-$WAFVERSION.tar.bz2
 WAFURL=https://waf.io/$WAFTARBALL