chore: update cp version to 2.6.2dev20250529 #684

fd0r · 2024-05-17T09:16:03Z

For now we target Zama's index but once 2.6.2 is on pypi we'll need to change it (it will just be about removing the source argument from pyproject.toml).

pyproject.toml

jfrery

Looks good to me. Thanks!

RomanBredehoft

do we want to do this upgrade knowing this issue : https://github.com/zama-ai/concrete-internal/issues/717 ?

fd0r · 2024-05-23T11:49:36Z

do we want to do this upgrade knowing this issue : zama-ai/concrete-internal#717 ?

Very good question @RomanBredehoft since this isn't a release version it's fine with me with the verbose stuff but maybe @andrei-stoian-zama can have the last word on that?

fd0r · 2024-05-24T07:37:57Z

Writing here what was decided on slack.

We wait to have a flag to disable these warnings and let the Concrete team investigate where these overflows come from and how badly they impact us.

andrei-stoian-zama · 2024-05-27T06:50:33Z

The nightly with the disable flag should be available

github-actions · 2024-05-27T12:27:35Z

⚠️ 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_networks[compile--FHE_simulation-model1-5-relu]- tests/torch/test_compile_torch.py::test_compile_torch_or_onnx_conv_networks[False-True-CNN_grouped-relu]

fd0r · 2024-05-27T12:38:56Z

Latest nightly still outputting warnings, let's wait for the next one!

RomanBredehoft · 2024-05-29T09:19:21Z

Makefile

@@ -19,7 +19,7 @@ OPEN_PR="true"
 # Force the installation of a Concrete Python version, which is very useful with nightly versions
 # /!\ WARNING /!\: This version should NEVER be a wildcard as it might create some
 # issues when trying to run it in the future.
-CONCRETE_PYTHON_VERSION="concrete-python==2024.4.19"
+CONCRETE_PYTHON_VERSION="concrete-python==2.6.2.dev20240529"


btw, now that nightlies are completely public and handled directly in the lock file, I think we can safely remove this and all related parts

That's correct, let's do that in a follow up PR

sure yes : https://github.com/zama-ai/concrete-ml-internal/issues/4463

For now we target Zama's index. Once the newest version is on pypi we'll need to change it. (it will just be about removing the source argument from pyproject.toml).

fd0r · 2024-05-29T10:21:57Z

pyproject.toml

@@ -34,7 +34,8 @@ readme = "README.md"
 # Investigate if it is better to fix specific versions or use lower and upper bounds  
 # FIXME: https://github.com/zama-ai/concrete-ml-internal/issues/2665
 python = ">=3.8.1,<3.11"
-concrete-python = "2.6.0-rc1"
+concrete-python = {version="==2.6.2.dev20240529", source = "zama-pypi"}
+# concrete-python = ">=2.6.2.dev20240523,<3.0"


Couldn't use that requirement because 2.6.2 > 2.6.2dev, so poetry lock would install 2.6.2

but we want to fix CP's version no ?

Well that's a good question. I'm not so sure about that.

In theory we should only require the major version of a package unless we know that there is a change that breaks our code base.

Introducing more flexibility here would let us avoid the need of doing a patch release whenever Concrete Python does ones. That wouldn't be reflected in the lock file though

yeah for our other libraries I pretty much agree, but CP is a bit different, especially since we consider nightly versions and I don't think we would want poetry to consider the most recent nightly each time we update the lock (?)

fd0r · 2024-05-29T10:23:19Z

pyproject.toml

@@ -78,6 +85,8 @@ mdformat = "^0.7.14"
 mdformat_myst = "^0.1.4"
 mdformat-toc = "^0.3.0"
 pip-audit = "^2.1.0"
+types-requests = "^2.32.0"
+requests="^2.32.1"


requests was installed by type-requests

but didn't you removed types-requests initially ? why is it needed then ?

We need requests for dev scripts. @jfrery had removed it some time ago but by keeping type-requests we were in fact still installing it. It was weird to me that we had the type stubs of a packages that we weren't requiring. So I tried removing it but everything broke. So I added back requests here since I feel like it's more explicit than relying on the fact that type-requests requires requests.

hmm interesting, gotcha

github-actions · 2024-05-29T11:04:36Z

Coverage passed ✅

Coverage details

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

59 files skipped due to complete coverage.

RomanBredehoft

thanks ! just have a few questions, which could be handled in a following PR if needed

fd0r requested a review from a team as a code owner May 17, 2024 09:16

cla-bot bot added the cla-signed label May 17, 2024

fd0r force-pushed the update_cp_2_7_0rc1 branch 3 times, most recently from 9fba529 to ddf9dd3 Compare May 21, 2024 12:47

RomanBredehoft reviewed May 21, 2024

View reviewed changes

pyproject.toml Show resolved Hide resolved

fd0r force-pushed the update_cp_2_7_0rc1 branch 6 times, most recently from 71f336b to 26bca9f Compare May 23, 2024 08:52

fd0r requested review from RomanBredehoft and a team May 23, 2024 11:12

jfrery previously approved these changes May 23, 2024

View reviewed changes

RomanBredehoft requested changes May 23, 2024

View reviewed changes

fd0r dismissed jfrery’s stale review via 6167d27 May 27, 2024 11:12

fd0r force-pushed the update_cp_2_7_0rc1 branch from 26bca9f to 6167d27 Compare May 27, 2024 11:12

fd0r force-pushed the update_cp_2_7_0rc1 branch 5 times, most recently from ffe3d70 to e615e3b Compare May 29, 2024 08:32

RomanBredehoft reviewed May 29, 2024

View reviewed changes

chore: update cp version to 2.6.2dev20240529

dc86114

For now we target Zama's index. Once the newest version is on pypi we'll need to change it. (it will just be about removing the source argument from pyproject.toml).

fd0r force-pushed the update_cp_2_7_0rc1 branch from efcde73 to dc86114 Compare May 29, 2024 09:57

fd0r commented May 29, 2024

View reviewed changes

fd0r changed the title ~~chore: update cp version to 2.6.2~~ chore: update cp version to 2.6.2dev20250529 May 29, 2024

fd0r requested a review from RomanBredehoft May 29, 2024 11:29

RomanBredehoft approved these changes May 29, 2024

View reviewed changes

fd0r merged commit 9a8121c into main May 29, 2024
12 checks passed

fd0r deleted the update_cp_2_7_0rc1 branch May 29, 2024 11:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: update cp version to 2.6.2dev20250529 #684

chore: update cp version to 2.6.2dev20250529 #684

fd0r commented May 17, 2024

jfrery left a comment

RomanBredehoft left a comment

fd0r commented May 23, 2024

fd0r commented May 24, 2024

andrei-stoian-zama commented May 27, 2024

github-actions bot commented May 27, 2024

Known flaky tests that initially failed:

fd0r commented May 27, 2024

RomanBredehoft May 29, 2024 •

edited

fd0r May 29, 2024

RomanBredehoft May 29, 2024

fd0r May 29, 2024

RomanBredehoft May 29, 2024

fd0r May 29, 2024

RomanBredehoft May 29, 2024

fd0r May 29, 2024

RomanBredehoft May 29, 2024

fd0r May 29, 2024

RomanBredehoft May 29, 2024

github-actions bot commented May 29, 2024

RomanBredehoft left a comment •

edited

chore: update cp version to 2.6.2dev20250529 #684

chore: update cp version to 2.6.2dev20250529 #684

Conversation

fd0r commented May 17, 2024

jfrery left a comment

Choose a reason for hiding this comment

RomanBredehoft left a comment

Choose a reason for hiding this comment

fd0r commented May 23, 2024

fd0r commented May 24, 2024

andrei-stoian-zama commented May 27, 2024

github-actions bot commented May 27, 2024

⚠️ Known flaky tests have been rerun ⚠️

Known flaky tests that initially failed:

fd0r commented May 27, 2024

RomanBredehoft May 29, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented May 29, 2024

Coverage passed ✅

RomanBredehoft left a comment • edited

Choose a reason for hiding this comment

RomanBredehoft May 29, 2024 •

edited

RomanBredehoft left a comment •

edited