Changeset d1d4ad4


Ignore:
Timestamp:
Nov 21, 2018, 1:00:47 PM (13 months 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:
6 edited

Legend:

Unmodified
Added
Removed
  • .appveyor.yml

    rc03d191 rd1d4ad4  
    33
    44environment:
    5 
    6   global:
    7       CUSTOM64PATH: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin
    85
    96  matrix:
     
    4441
    4542install:
    46 
    4743  - ECHO "Installed SDKs:"
    4844  - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""
    4945
    5046  - "SET PATH=%PYTHONDIR%;%PYTHONDIR%\\Scripts;%PATH%"
    51 
    52   - if [%PYTHON_ARCH%]==[64] SET PATH=%CUSTOM64PATH%;%PATH%
    5347
    5448  # Check that we have the expected version and architecture for Python
     
    7266  # clean before building python package
    7367  - python waf distclean
    74   # build python module without using libaubio
    75   - pip wheel -v -v -v --wheel-dir=dist .
    7668  # build, upload and install wheel (inspired by numpy's appveyor)
    7769  - ps: |
  • python/ext/py-filterbank.c

    rc03d191 rd1d4ad4  
    123123
    124124  PyObject *input;
    125   uint_t samplerate;
    126   if (!PyArg_ParseTuple (args, "OI", &input, &samplerate)) {
     125  smpl_t samplerate;
     126  if (!PyArg_ParseTuple (args, "O" AUBIO_NPY_SMPL_CHR, &input, &samplerate)) {
    127127    return NULL;
    128128  }
     
    269269Py_filterbank_set_power(Py_filterbank *self, PyObject *args)
    270270{
    271   uint_t power;
    272 
    273   if (!PyArg_ParseTuple (args, "I", &power)) {
     271  smpl_t power;
     272
     273  if (!PyArg_ParseTuple (args, AUBIO_NPY_SMPL_CHR, &power)) {
    274274    return NULL;
    275275  }
     
    292292Py_filterbank_set_norm(Py_filterbank *self, PyObject *args)
    293293{
    294   uint_t playing;
    295 
    296   if (!PyArg_ParseTuple (args, "I", &playing)) {
    297     return NULL;
    298   }
    299   if(aubio_filterbank_set_norm (self->o, playing)) {
     294  smpl_t norm;
     295
     296  if (!PyArg_ParseTuple (args, AUBIO_NPY_SMPL_CHR, &norm)) {
     297    return NULL;
     298  }
     299  if(aubio_filterbank_set_norm (self->o, norm)) {
    300300    if (PyErr_Occurred() == NULL) {
    301301      PyErr_SetString (PyExc_ValueError,
  • python/ext/py-source.c

    rc03d191 rd1d4ad4  
    156156"...         n_frames += len(samples)\n"
    157157"...     print('read', n_frames, 'samples in', samples.shape[0], 'channels',\n"
    158 "...         'from file \"\%s\"' \% source.uri)\n"
     158"...         'from file \"%%s\"' %% source.uri)\n"
    159159"...\n"
    160160"read 239334 samples in 2 channels from file \"audiotrack.wav\"\n"
  • python/lib/gen_external.py

    rc03d191 rd1d4ad4  
    7575        cpp_cmd += ['-E']
    7676
     77    # On win-amd64 (py3.x), the default compiler is cross-compiling, from x86
     78    # to amd64 with %WIN_SDK_ROOT%\x86_amd64\cl.exe, but using this binary as a
     79    # pre-processor generates no output, so we use %WIN_SDK_ROOT%\cl.exe
     80    # instead.
     81    if len(cpp_cmd) > 1 and 'cl.exe' in cpp_cmd[-2]:
     82        plat = os.path.basename(os.path.dirname(cpp_cmd[-2]))
     83        if plat == 'x86_amd64':
     84            print('workaround on win64 to avoid empty pre-processor output')
     85            cpp_cmd[-2] = cpp_cmd[-2].replace('x86_amd64', '')
     86        elif True in ['amd64' in f for f in cpp_cmd]:
     87            print('warning: not using workaround for', cpp_cmd[0], plat)
     88
    7789    if not cpp_cmd:
    7890        print("Warning: could not guess preprocessor, using env's CC")
  • python/tests/test_mfcc.py

    rc03d191 rd1d4ad4  
    141141        buf_size, n_filters, n_coeffs, samplerate = 512, 40, 10, 16000
    142142        m = mfcc(buf_size, n_filters, n_coeffs, samplerate)
    143         m.set_mel_coeffs_slaney(samplerate)
     143        m.set_mel_coeffs_slaney()
    144144        m(cvec(buf_size))
    145145        assert m.get_power() == 1
  • scripts/get_waf.sh

    rc03d191 rd1d4ad4  
    44#set -x
    55
    6 WAFVERSION=2.0.11
     6WAFVERSION=2.0.12
    77WAFTARBALL=waf-$WAFVERSION.tar.bz2
    88WAFURL=https://waf.io/$WAFTARBALL
Note: See TracChangeset for help on using the changeset viewer.