repo-sync-2025-01-02T18:56:23+0800 #954

w-gc · 2025-01-02T10:58:49Z

[SPU] Migrating to Bazel Modules and update minimum Python version to 3.10.
[Feature] Add soPRF (LowMC cipher) for SEMI2K
[API] Add Permute/InvPermute support in HLO
[Feature] Add SSL configuration to the TTP server
[Feature] Support quick sort for semi2k and aby3

tpppppub · 2025-01-02T11:16:41Z

CONTRIBUING.md (maybe more docs) and circleci scripts should also be updated. Besides, I don't get why drop python3.9 at this moment as it's not beyond the end of life.

tpppppub · 2025-01-02T11:20:42Z

The other pending PRs may also be notified this change. It will be better to merge them first as this PR will cause a huge amount of conflicts.

w-gc · 2025-01-02T11:32:56Z

CONTRIBUING.md (maybe more docs) and circleci scripts should also be updated. Besides, I don't get why drop python3.9 at this moment as it's not beyond the end of life.

@tpppppub Okay, I will update them. Python 3.9 is out of the supported window of Python and JAX now. And, it's a good time to update minimum Python version to 3.10, because we have just successfully released SPU 0.9.3b, and we are now migrating to Bazel Modules, which is a big change.

ref:

tongke6

LGTM

bazel/patches/grpc-1.66.patch

tongke6

requirements-dev.txt and requirements.txt are still needed by //:spu_wheel and //:requirements-dev.update commands

w-gc · 2025-01-03T02:57:33Z

The other pending PRs may also be notified this change. It will be better to merge them first as this PR will cause a huge amount of conflicts.

I have checked the conflicts about branch w-gc:sync and pending PRs. The conflicts are small than we feared：

---------------start to check PR952---------------
Already on 'main'
Your branch is up to date with 'origin/main'.
From https://github.com/secretflow/spu
 * [new ref]         refs/pull/952/head -> PR952
Switched to branch 'PR952'
Auto-merging sml/decomposition/BUILD.bazel
Automatic merge went well; stopped before committing as requested
---------------start to check PR951---------------
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
error: branch 'PR951' not found
From https://github.com/secretflow/spu
 * [new ref]         refs/pull/951/head -> PR951
Switched to branch 'PR951'
Auto-merging libspu/kernel/hal/permute.h
CONFLICT (content): Merge conflict in libspu/kernel/hal/permute.h
Auto-merging sml/manifold/BUILD.bazel
CONFLICT (content): Merge conflict in sml/manifold/BUILD.bazel
Auto-merging spu/intrinsic/BUILD.bazel
Automatic merge failed; fix conflicts and then commit the result.
---------------start to check PR950---------------
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
From https://github.com/secretflow/spu
 * [new ref]         refs/pull/950/head -> PR950
Switched to branch 'PR950'
Auto-merging libspu/version.h.in
CONFLICT (content): Merge conflict in libspu/version.h.in
Automatic merge failed; fix conflicts and then commit the result.
---------------start to check PR939---------------
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
From https://github.com/secretflow/spu
 * [new ref]         refs/pull/939/head -> PR939
Switched to branch 'PR939'
Automatic merge went well; stopped before committing as requested
---------------start to check PR881---------------
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
From https://github.com/secretflow/spu
 * [new ref]         refs/pull/881/head -> PR881
Switched to branch 'PR881'
fatal: refusing to merge unrelated histories
fatal: There is no merge to abort (MERGE_HEAD missing).
---------------start to check PR880---------------
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
From https://github.com/secretflow/spu
 * [new ref]         refs/pull/880/head -> PR880
Switched to branch 'PR880'
Auto-merging libspu/core/config.cc
Auto-merging libspu/core/encoding.cc
Auto-merging libspu/mpc/BUILD.bazel
Auto-merging libspu/mpc/ab_api_test.cc
Auto-merging libspu/mpc/api.cc
Auto-merging libspu/mpc/api.h
Auto-merging libspu/mpc/common/BUILD.bazel
Auto-merging libspu/mpc/common/communicator.cc
CONFLICT (content): Merge conflict in libspu/mpc/common/communicator.cc
Auto-merging libspu/mpc/common/communicator.h
CONFLICT (content): Merge conflict in libspu/mpc/common/communicator.h
Auto-merging libspu/mpc/kernel.cc
Auto-merging libspu/mpc/kernel.h
Auto-merging libspu/mpc/utils/BUILD.bazel
CONFLICT (content): Merge conflict in libspu/mpc/utils/BUILD.bazel
Auto-merging libspu/mpc/utils/gfmp.h
CONFLICT (add/add): Merge conflict in libspu/mpc/utils/gfmp.h
Auto-merging libspu/mpc/utils/gfmp_ops.cc
CONFLICT (add/add): Merge conflict in libspu/mpc/utils/gfmp_ops.cc
Auto-merging libspu/mpc/utils/gfmp_ops.h
CONFLICT (add/add): Merge conflict in libspu/mpc/utils/gfmp_ops.h
Auto-merging libspu/spu.proto
Automatic merge failed; fix conflicts and then commit the result.
---------------start to check PR842---------------
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
From https://github.com/secretflow/spu
 * [new ref]         refs/pull/842/head -> PR842
Switched to branch 'PR842'
Automatic merge went well; stopped before committing as requested

tongke6 · 2025-01-03T03:09:17Z

The other pending PRs may also be notified this change. It will be better to merge them first as this PR will cause a huge amount of conflicts.

I have checked the conflicts about branch w-gc:sync and pending PRs. The conflicts are small than we feared：

---------------start to check PR952---------------
Already on 'main'
Your branch is up to date with 'origin/main'.
From https://github.com/secretflow/spu
 * [new ref]         refs/pull/952/head -> PR952
Switched to branch 'PR952'
Auto-merging sml/decomposition/BUILD.bazel
Automatic merge went well; stopped before committing as requested
---------------start to check PR951---------------
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
error: branch 'PR951' not found
From https://github.com/secretflow/spu
 * [new ref]         refs/pull/951/head -> PR951
Switched to branch 'PR951'
Auto-merging libspu/kernel/hal/permute.h
CONFLICT (content): Merge conflict in libspu/kernel/hal/permute.h
Auto-merging sml/manifold/BUILD.bazel
CONFLICT (content): Merge conflict in sml/manifold/BUILD.bazel
Auto-merging spu/intrinsic/BUILD.bazel
Automatic merge failed; fix conflicts and then commit the result.
---------------start to check PR950---------------
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
From https://github.com/secretflow/spu
 * [new ref]         refs/pull/950/head -> PR950
Switched to branch 'PR950'
Auto-merging libspu/version.h.in
CONFLICT (content): Merge conflict in libspu/version.h.in
Automatic merge failed; fix conflicts and then commit the result.
---------------start to check PR939---------------
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
From https://github.com/secretflow/spu
 * [new ref]         refs/pull/939/head -> PR939
Switched to branch 'PR939'
Automatic merge went well; stopped before committing as requested
---------------start to check PR881---------------
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
From https://github.com/secretflow/spu
 * [new ref]         refs/pull/881/head -> PR881
Switched to branch 'PR881'
fatal: refusing to merge unrelated histories
fatal: There is no merge to abort (MERGE_HEAD missing).
---------------start to check PR880---------------
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
From https://github.com/secretflow/spu
 * [new ref]         refs/pull/880/head -> PR880
Switched to branch 'PR880'
Auto-merging libspu/core/config.cc
Auto-merging libspu/core/encoding.cc
Auto-merging libspu/mpc/BUILD.bazel
Auto-merging libspu/mpc/ab_api_test.cc
Auto-merging libspu/mpc/api.cc
Auto-merging libspu/mpc/api.h
Auto-merging libspu/mpc/common/BUILD.bazel
Auto-merging libspu/mpc/common/communicator.cc
CONFLICT (content): Merge conflict in libspu/mpc/common/communicator.cc
Auto-merging libspu/mpc/common/communicator.h
CONFLICT (content): Merge conflict in libspu/mpc/common/communicator.h
Auto-merging libspu/mpc/kernel.cc
Auto-merging libspu/mpc/kernel.h
Auto-merging libspu/mpc/utils/BUILD.bazel
CONFLICT (content): Merge conflict in libspu/mpc/utils/BUILD.bazel
Auto-merging libspu/mpc/utils/gfmp.h
CONFLICT (add/add): Merge conflict in libspu/mpc/utils/gfmp.h
Auto-merging libspu/mpc/utils/gfmp_ops.cc
CONFLICT (add/add): Merge conflict in libspu/mpc/utils/gfmp_ops.cc
Auto-merging libspu/mpc/utils/gfmp_ops.h
CONFLICT (add/add): Merge conflict in libspu/mpc/utils/gfmp_ops.h
Auto-merging libspu/spu.proto
Automatic merge failed; fix conflicts and then commit the result.
---------------start to check PR842---------------
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
From https://github.com/secretflow/spu
 * [new ref]         refs/pull/842/head -> PR842
Switched to branch 'PR842'
Automatic merge went well; stopped before committing as requested

Agree +1

tongke6 · 2025-01-03T07:26:15Z

@w-gc I will approve this PR first. CI failures could be fixed in the next PR.

repo-sync-2025-01-02T18:56:23+0800

c7ec9f4

w-gc added 2 commits January 2, 2025 20:02

clean

8f233e3

format

e89ff62

tongke6 previously approved these changes Jan 2, 2025

View reviewed changes

tongke6 reviewed Jan 2, 2025

View reviewed changes

bazel/patches/grpc-1.66.patch Outdated Show resolved Hide resolved

fix patch issue

d8058e8

w-gc dismissed tongke6’s stale review via d8058e8 January 3, 2025 02:08

w-gc requested a review from tongke6 January 3, 2025 02:19

tongke6 previously approved these changes Jan 3, 2025

View reviewed changes

w-gc requested a review from tongke6 January 3, 2025 02:20

tongke6 reviewed Jan 3, 2025

View reviewed changes

revert requirements.txt

f617bdf

w-gc dismissed tongke6’s stale review via f617bdf January 3, 2025 03:07

w-gc added 2 commits January 3, 2025 14:01

debug

afe1b01

test

365da6b

tongke6 previously approved these changes Jan 3, 2025

View reviewed changes

disable spu_wheel

aa426e1

w-gc dismissed tongke6’s stale review via aa426e1 January 3, 2025 07:30

tongke6 previously approved these changes Jan 3, 2025

View reviewed changes

fix

a660037

w-gc dismissed tongke6’s stale review via a660037 January 3, 2025 08:25

w-gc added 3 commits January 3, 2025 17:30

update cufft

1c509df

update

4548312

debug

2371c07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

repo-sync-2025-01-02T18:56:23+0800 #954

repo-sync-2025-01-02T18:56:23+0800 #954

w-gc commented Jan 2, 2025

tpppppub commented Jan 2, 2025

tpppppub commented Jan 2, 2025

w-gc commented Jan 2, 2025

tongke6 left a comment

tongke6 left a comment

w-gc commented Jan 3, 2025 •

edited

Loading

tongke6 commented Jan 3, 2025

tongke6 commented Jan 3, 2025

repo-sync-2025-01-02T18:56:23+0800 #954

Are you sure you want to change the base?

repo-sync-2025-01-02T18:56:23+0800 #954

Conversation

w-gc commented Jan 2, 2025

tpppppub commented Jan 2, 2025

tpppppub commented Jan 2, 2025

w-gc commented Jan 2, 2025

tongke6 left a comment

Choose a reason for hiding this comment

tongke6 left a comment

Choose a reason for hiding this comment

w-gc commented Jan 3, 2025 • edited Loading

tongke6 commented Jan 3, 2025

tongke6 commented Jan 3, 2025

w-gc commented Jan 3, 2025 •

edited

Loading