Skip to content

Conversation

ncassereau
Copy link
Contributor

@ncassereau ncassereau commented May 18, 2022

List of changes

  • Allow test_mm_convergence in test_unbalanced.py to run with Cupy (which does not allow implicit conversion)
  • Make numIter a 64bits variable in the Cython code
  • Add it to RELEASES.md

Motivation and context / Related issue

When the OpenMP version of EMD was added, the computation of the plan was converted to 64 bits. However, one variable was forgotten, which is the max number of iterations. In the C code, it is a size_t variable, hence usually 64 bits, but the Cython link between C and Python uses an int to store the value. I intend to make it 64 bits as well to allow high numbers of iterations.

How has this been tested (if it applies)

I run all tests on Jean Zay.

PR checklist

  • I have read the CONTRIBUTING document.
  • The documentation is up-to-date with the changes I made (check build artifacts).
  • All tests passed, and additional code has been covered with new tests.
  • I have added the PR and Issue fix to the RELEASES.md file.

@rflamary rflamary changed the title [WIP] Allow numItermax to be stored in 64 bits in EMD solver [WIP] numItermax in 64 bits in EMD solver May 18, 2022
@ncassereau ncassereau marked this pull request as ready for review May 20, 2022 09:16
@ncassereau ncassereau changed the title [WIP] numItermax in 64 bits in EMD solver [MRG] numItermax in 64 bits in EMD solver May 20, 2022
@codecov
Copy link

codecov bot commented May 31, 2022

Codecov Report

Merging #380 (467505c) into master (951209a) will decrease coverage by 0.03%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master     #380      +/-   ##
==========================================
- Coverage   93.79%   93.76%   -0.04%     
==========================================
  Files          23       23              
  Lines        5934     5934              
==========================================
- Hits         5566     5564       -2     
- Misses        368      370       +2     

@rflamary rflamary merged commit 1f30759 into PythonOT:master Jun 1, 2022
@ncassereau ncassereau deleted the bug_numIter_64bits branch November 21, 2022 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants