Code

[MRG] Fix numpy versions problems#411

Code

Merged

YannCabanes merged 69 commits intotslearn-team:maintslearn-team/tslearn:mainfrom YannCabanes:fix-numpy-versions-problemsYannCabanes/tslearn:fix-numpy-versions-problemsCopy head branch name to clipboardOct 4, 2022

+544-438

Commits

Commits on Jun 3, 2022

• add new empty line at the end of python file in tslearn/clustering/__init.py

  YannCabanes

  committed
  c49ffaa

  Copy full SHA for c49ffaa

Commits on Jun 29, 2022

• Merge branch 'main' of github.com:tslearn-team/tslearn into main

  YannCabanes

  committed
  7761eb0

  Copy full SHA for 7761eb0

Commits on Jul 1, 2022

• Empty commit

  YannCabanes

  committed
  5a55157

  Copy full SHA for 5a55157

Commits on Jul 4, 2022

• Upgrade numpy

  YannCabanes

  committed
  295f23f

  Copy full SHA for 295f23f

• Upgrade numpy with --ignore-installed

  YannCabanes

  committed
  8ed9d19

  Copy full SHA for 8ed9d19

• Upgrade numpy with --ignore-installed before scikit-learn install

  YannCabanes

  committed
  1b98337

  Copy full SHA for 1b98337

• Specify numpy version 1.22 for Numba compatibility

  YannCabanes

  committed
  74d10d7

  Copy full SHA for 74d10d7

• Correct numpy version 1.22 instead of 0.22

  YannCabanes

  committed
  49ee566

  Copy full SHA for 49ee566

• Use numpy version 1.21.6 for Python 3.7 compatibility

  YannCabanes

  committed
  ac0e258

  Copy full SHA for ac0e258

• Try to unspecify scikit-learn version

  YannCabanes

  committed
  cc3ed14

  Copy full SHA for cc3ed14

• Empty commit

  YannCabanes

  committed
  7aa61f2

  Copy full SHA for 7aa61f2

• Remove commented lines

  YannCabanes

  committed
  9a8c0ec

  Copy full SHA for 9a8c0ec

Commits on Jul 6, 2022

• Try to install numpy before requirements

  YannCabanes

  committed
  22e3c22

  Copy full SHA for 22e3c22

• Specify scikit-learn==1.0

  YannCabanes

  committed
  f201499

  Copy full SHA for f201499

• Add --upgrade option for requirements.

  YannCabanes

  committed
  6fc0fae

  Copy full SHA for 6fc0fae

• Add eager option for requirements install.

  YannCabanes

  committed
  98e480b

  Copy full SHA for 98e480b

• Install numpy==1.22 for Python 3.8 adn 3.9 only (for linux).

  YannCabanes

  committed
  c0070cc

  Copy full SHA for c0070cc

• Remove tests on Python 3.7 for now (on linux)

  YannCabanes

  committed
  11cb4f0

  Copy full SHA for 11cb4f0

• Fix error in writing numpy==1.22

  YannCabanes

  committed
  2219370

  Copy full SHA for 2219370

• Install scikit-learn==1.0 before reading the requirements

  YannCabanes

  committed
  9b1dac8

  Copy full SHA for 9b1dac8

Commits on Aug 1, 2022

• Back to the main branch of tslearn

  YannCabanes

  committed
  3a6e357

  Copy full SHA for 3a6e357

• Add numpy.import_array() after cimport numpy

  YannCabanes

  committed
  2113c82

  Copy full SHA for 2113c82

Commits on Aug 4, 2022

• Replace cython files (.pyx) by usual python files (.py)

  YannCabanes

  committed
  9088159

  Copy full SHA for 9088159

• Remove cython from requirements and setup file

  YannCabanes

  committed
  b58e24c

  Copy full SHA for b58e24c

Commits on Aug 5, 2022

• Use numba in python files which where previously written in cython

  YannCabanes

  committed
  d6cc102

  Copy full SHA for d6cc102

• Change prange into range for loop with reversed index

  YannCabanes

  committed
  d4f8ee5

  Copy full SHA for d4f8ee5

• Remove reversed order in loop for numba nopython compatibility

  YannCabanes

  committed
  0298027

  Copy full SHA for 0298027

• Correct dtype error

  YannCabanes

  committed
  e35df6f

  Copy full SHA for e35df6f

• Remove useless variables and vectorize some for loops

  YannCabanes

  committed
  7d7b301

  Copy full SHA for 7d7b301

• Define forgotten variable

  YannCabanes

  committed
  f3311e3

  Copy full SHA for f3311e3

Commits on Aug 6, 2022

• Specify float dtype of a matrix

  YannCabanes

  committed
  485ce34

  Copy full SHA for 485ce34

Commits on Aug 17, 2022

• Add docstrings

  YannCabanes

  committed
  5efdfa5

  Copy full SHA for 5efdfa5

• Temporarily comment jit decorator to focus on other sources of code errors.

  YannCabanes

  committed
  5113b82

  Copy full SHA for 5113b82

Commits on Aug 22, 2022

• Correct indice error in for loop.

  YannCabanes

  committed
  f6d9633

  Copy full SHA for f6d9633

• Add necessary for loop.

  YannCabanes

  committed
  8282265

  Copy full SHA for 8282265

• Add jit decorators.

  YannCabanes

  committed
  be5802b

  Copy full SHA for be5802b

Commits on Aug 23, 2022

• Try to change np.float64 to float in type checks for Python 3.7 compatibility.

  YannCabanes

  committed
  149dd83

  Copy full SHA for 149dd83

Commits on Aug 25, 2022

• Comment assert dtype == np.float64 to solve Python 3.7 error

  YannCabanes

  committed
  63e5688

  Copy full SHA for 63e5688

Commits on Aug 26, 2022

• Update macOS-10.15 to macOS-12 in azure-pipelines.yml

  YannCabanes

  committed
  ce486c3

  Copy full SHA for ce486c3

• Add input variable types in jit decorator

  YannCabanes

  committed
  9fa690e

  Copy full SHA for 9fa690e

Commits on Aug 29, 2022

• Add type signature in git decorators of cycc.py

  YannCabanes

  committed
  10deda2

  Copy full SHA for 10deda2

• Add type signature in jit decorator of functions of cysax.py

  YannCabanes

  committed
  344fd6f

  Copy full SHA for 344fd6f

Commits on Sep 1, 2022

• Correct input type in jit decorator

  YannCabanes

  committed
  8dea56b

  Copy full SHA for 8dea56b

• Correct input type in jit decorator of cydist_sax function

  YannCabanes

  committed
  b143d35

  Copy full SHA for b143d35

• Try intp input type in jit decorator of function cydist_sax

  YannCabanes

  committed
  d141b5f

  Copy full SHA for d141b5f

• Try to use typeof for type inference in jit decorator of function cydist_sax

  YannCabanes

  committed
  f02aac7

  Copy full SHA for f02aac7

Commits on Sep 2, 2022

• Try to use typeof array for type inference in jit decorator of function cydist_sax

  YannCabanes

  committed
  e8aea51

  Copy full SHA for e8aea51

• Use typeof array for type inference in jit decorator of function cydist_1d_sax

  YannCabanes

  committed
  82fded2

  Copy full SHA for 82fded2

• Use typeof array for type inference in jit decorator of function inv_transform_sax

  YannCabanes

  committed
  12fe9ed

  Copy full SHA for 12fe9ed

• Solve np.linalg.norm problem in cycc.py for use of nopython mode in jit decorated functions

  YannCabanes

  committed
  7f0cf46

  Copy full SHA for 7f0cf46

• Use nopython mode in jit decorated functions of cysax.py and soft_dtw_fast.py

  YannCabanes

  committed
  1c95ab0

  Copy full SHA for 1c95ab0

Commits on Sep 3, 2022

• Add parallel option in jit decorators in files cycc.py and cysax.py

  YannCabanes

  committed
  91efe3f

  Copy full SHA for 91efe3f

• Add parallel option in jit decorator of function _jacobian_product_sq_euc

  YannCabanes

  committed
  66e8ada

  Copy full SHA for 66e8ada

• Delete useless white space to restart the continuous integration tests

  YannCabanes

  committed
  ec00802

  Copy full SHA for ec00802

• Add fastmath option in jit decorators

  YannCabanes

  committed
  521eb29

  Copy full SHA for 521eb29

Commits on Sep 6, 2022

• Simplify arrays in Numba typeof for type induction in jit decorators

  YannCabanes

  committed
  e1488e0

  Copy full SHA for e1488e0

• Add parallel option in jit decorators of functions _soft_dtw and _soft_dtw_grad (also removed prange from these functions)

  YannCabanes

  committed
  5beb063

  Copy full SHA for 5beb063

• Use range in decreasing order in function _soft_dtw_grad

  YannCabanes

  committed
  9a3ea24

  Copy full SHA for 9a3ea24

• Modify loop structure in funtion cdist_normalized_cc to use Numba prange

  YannCabanes

  committed
  6491c3b

  Copy full SHA for 6491c3b

• Correct docstring error in normalized_cc function

  YannCabanes

  committed
  5aa65ad

  Copy full SHA for 5aa65ad

• Add void as output type in jit decorator of functions _soft_dtw, _soft_dtw_grad and _jacobian_product_sq_euc

  YannCabanes

  committed
  5b6aef3

  Copy full SHA for 5b6aef3

• Remove comments in file cycc.py

  YannCabanes

  committed
  41386d5

  Copy full SHA for 41386d5

• Remove comments in file cysax.py

  YannCabanes

  committed
  e9908ed

  Copy full SHA for e9908ed

• Remove comments in file soft_dtw_fast.py

  YannCabanes

  committed
  aaba647

  Copy full SHA for aaba647

• Remove unused imports

  YannCabanes

  committed
  37e54a8

  Copy full SHA for 37e54a8

Commits on Sep 23, 2022

• Remove signatures (input and output types) in jit decorators

  YannCabanes

  committed
  46f9295

  Copy full SHA for 46f9295

Commits on Sep 26, 2022

• Empty commit

  YannCabanes

  committed
  7c859e1

  Copy full SHA for 7c859e1

Commits on Sep 28, 2022

• Vectorize a for loop in function inv_transform_sax

  YannCabanes

  committed
  eb111e1

  Copy full SHA for eb111e1

Commits on Sep 30, 2022

• Restore previous code formulation in function gamma_soft_dtw

  YannCabanes

  committed
  1975b0f

  Copy full SHA for 1975b0f