Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: adding support for python3.11 #701

Merged
merged 2 commits into from
Aug 27, 2024
Merged

feat: adding support for python3.11 #701

merged 2 commits into from
Aug 27, 2024

Conversation

bcm-at-zama
Copy link
Collaborator

@bcm-at-zama bcm-at-zama commented May 28, 2024 •
edited
Loading

  • Adding support for python 3.11 in the CML sources/dep
  • Adding tests with 3.11 in the weekly (on top of 3.8, 3.9, 3.10)

You may want, in a further PR, to change the default 3.8 python to a more recent 3.11 python for your tests. Maybe it would make the CI faster? You might also want to drop 3.8 support now, or wait EOL in October.

closes #https://github.com/zama-ai/concrete-ml-internal/issues/3774

@bcm-at-zama bcm-at-zama requested a review from a team as a code owner May 28, 2024 07:50
@cla-bot cla-bot bot added the cla-signed label May 28, 2024
@bcm-at-zama bcm-at-zama marked this pull request as draft May 28, 2024 07:50
@bcm-at-zama bcm-at-zama marked this pull request as ready for review May 28, 2024 09:30
@bcm-at-zama
Copy link
Collaborator Author

I hope the pytests to be green

jfrery
jfrery reviewed May 28, 2024
View reviewed changes
.github/workflows/continuous-integration.yaml Show resolved Hide resolved
.github/workflows/continuous-integration.yaml Show resolved Hide resolved
.github/workflows/continuous-integration.yaml Show resolved Hide resolved
README.md Show resolved Hide resolved
deps_licenses/licenses_mac_intel_user.txt Outdated Show resolved Hide resolved
@bcm-at-zama
Copy link
Collaborator Author

I've added a few cases for 3.11 which didn't appear necessary for the CI

RomanBredehoft
RomanBredehoft approved these changes May 28, 2024
View reviewed changes
Copy link
Collaborator

@RomanBredehoft RomanBredehoft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks !

RomanBredehoft
RomanBredehoft requested changes May 28, 2024
View reviewed changes
Copy link
Collaborator

@RomanBredehoft RomanBredehoft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it would be great to run a CI with python 3.11 to check that tests are alright !

@jfrery jfrery marked this pull request as draft May 28, 2024 13:17
@jfrery
Copy link
Collaborator

jfrery commented May 28, 2024

Supporting python 3.11 is a bit more complicated as we need to update torch to 2.0.0 as well. See https://github.com/zama-ai/concrete-ml-internal/issues/3774#issuecomment-2135200722

bcm-at-zama
bcm-at-zama commented May 29, 2024
View reviewed changes
script/actions_utils/generate_test_matrix.py Show resolved Hide resolved
script/make_utils/check_installation_with_all_python.sh
@@ -25,7 +25,7 @@ do
;;

"--all" )
VERSION_LIST="3.8 3.9 3.10"
VERSION_LIST="3.8 3.9 3.10 3.11"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

new

script/make_utils/licenses.sh
@@ -108,6 +108,8 @@ then
IS_CORRECT_PYTHON=1
elif [[ "${CHECK_VERSION}" == *"3.10"* ]]; then
IS_CORRECT_PYTHON=1
elif [[ "${CHECK_VERSION}" == *"3.11"* ]]; then
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

new

@bcm-at-zama
Copy link
Collaborator Author

Sad for torch 2.0. So, do not hesitate to close this PR if it's not the right time, since indeed, there will be work for torch 2.0 integration.

@bcm-at-zama bcm-at-zama changed the title feat: adding support for python3.11 feat: adding support for python3.11 [blocked by issues like the need of moving to Torch 2.0] May 29, 2024
@bcm-at-zama
Copy link
Collaborator Author

What about doing it now, @andrei-stoian-zama ? Do you need help here

@bcm-at-zama bcm-at-zama force-pushed the support_python3.11_3774 branch 2 times, most recently from 2237284 to 608c0d6 Compare August 8, 2024 14:59
@bcm-at-zama bcm-at-zama changed the title feat: adding support for python3.11 [blocked by issues like the need of moving to Torch 2.0] feat: adding support for python3.11 Aug 8, 2024
@bcm-at-zama
Copy link
Collaborator Author

Reactivating this old PR

@bcm-at-zama
Copy link
Collaborator Author

Let's see if it's green

@bcm-at-zama bcm-at-zama force-pushed the support_python3.11_3774 branch 2 times, most recently from ab040d7 to 92be561 Compare August 9, 2024 09:40
@bcm-at-zama bcm-at-zama marked this pull request as ready for review August 9, 2024 12:41
@bcm-at-zama
Copy link
Collaborator Author

Looks like it works, @zama-ai/ml ! I guess the 3.11 tests will only be launched when we merge, within the weekly build. It's worth merging this, it has been added a few times by users.

kcelia
kcelia previously approved these changes Aug 9, 2024
View reviewed changes
RomanBredehoft
RomanBredehoft previously approved these changes Aug 13, 2024
View reviewed changes
Copy link
Collaborator

@RomanBredehoft RomanBredehoft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks !

@bcm-at-zama
Copy link
Collaborator Author

Let me rebase this

@bcm-at-zama bcm-at-zama dismissed stale reviews from RomanBredehoft and kcelia via 0379578 August 27, 2024 12:55
@bcm-at-zama bcm-at-zama force-pushed the support_python3.11_3774 branch 2 times, most recently from 0379578 to 6e3d8da Compare August 27, 2024 12:56
@bcm-at-zama
Copy link
Collaborator Author

Has been rebased, let's wait it's green

@bcm-at-zama bcm-at-zama mentioned this pull request Aug 27, 2024
Open
@github-actions GitHub Actions
Copy link

⚠️ Known flaky tests have been rerun ⚠️

One or several tests initially failed but were identified as known flaky. tests. Therefore, they have been rerun and passed. See below for more details.

Failed tests details

Known flaky tests that initially failed:

  • tests/torch/test_compile_torch.py::test_compile_torch_or_onnx_conv_networks[True-True-CNN-relu]

@github-actions GitHub Actions
Copy link

Coverage passed ✅

Coverage details 

---------- coverage: platform linux, python 3.8.18-final-0 -----------
Name    Stmts   Miss  Cover   Missing
-------------------------------------
TOTAL    8108      0   100%

60 files skipped due to complete coverage.

andrei-stoian-zama
andrei-stoian-zama approved these changes Aug 27, 2024
View reviewed changes
Copy link
Collaborator

@andrei-stoian-zama andrei-stoian-zama left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks a lot!

@andrei-stoian-zama andrei-stoian-zama merged commit 819dca7 into main Aug 27, 2024
14 checks passed
@andrei-stoian-zama andrei-stoian-zama deleted the support_python3.11_3774 branch August 27, 2024 15:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yuxizama yuxizama yuxizama left review comments

@andrei-stoian-zama andrei-stoian-zama andrei-stoian-zama approved these changes

@kcelia kcelia kcelia left review comments

@RomanBredehoft RomanBredehoft RomanBredehoft left review comments

@jfrery jfrery Awaiting requested review from jfrery

Assignees
No one assigned
Labels
cla-signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@bcm-at-zama @jfrery @kcelia @RomanBredehoft @andrei-stoian-zama @yuxizama