diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 3ae24a2d1cc..bc014f67e4a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.2-beta.30 +current_version = 0.8.2-beta.31 tag = False tag_name = {new_version} commit = True diff --git a/.github/workflows/nightlies.yml b/.github/workflows/nightlies.yml index 0e6b5358fa4..51ef37119c5 100644 --- a/.github/workflows/nightlies.yml +++ b/.github/workflows/nightlies.yml @@ -42,7 +42,7 @@ jobs: uses: OpenMined/PySyft/.github/workflows/container-scan.yml@dev secrets: inherit - call-rhel-tests: - if: github.repository == 'OpenMined/PySyft' # don't run on forks - uses: OpenMined/PySyft/.github/workflows/rhel-tests.yml@dev - secrets: inherit + # call-rhel-tests: + # if: github.repository == 'OpenMined/PySyft' # don't run on forks + # uses: OpenMined/PySyft/.github/workflows/rhel-tests.yml@dev + # secrets: inherit diff --git a/.github/workflows/pr-tests-frontend.yml b/.github/workflows/pr-tests-frontend.yml index 4a215141480..a63c4e44f42 100644 --- a/.github/workflows/pr-tests-frontend.yml +++ b/.github/workflows/pr-tests-frontend.yml @@ -74,7 +74,7 @@ jobs: - name: Docker on MacOS if: steps.changes.outputs.frontend == 'true' && matrix.os == 'macos-latest' - uses: crazy-max/ghaction-setup-docker@v1.3.0 + uses: crazy-max/ghaction-setup-docker@v2.0.0 - name: Install Tox if: steps.changes.outputs.frontend == 'true' @@ -162,7 +162,7 @@ jobs: - name: Docker on MacOS if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest' - uses: crazy-max/ghaction-setup-docker@v1.3.0 + uses: crazy-max/ghaction-setup-docker@v2.0.0 - name: Install Tox if: steps.changes.outputs.stack == 'true' diff --git a/.github/workflows/pr-tests-stack-arm64.yml b/.github/workflows/pr-tests-stack-arm64.yml index d29185523cc..847b63cd413 100644 --- a/.github/workflows/pr-tests-stack-arm64.yml +++ b/.github/workflows/pr-tests-stack-arm64.yml @@ -21,12 +21,12 @@ jobs: os: [ubuntu-latest] python-version: ["3.11"] - runs-on: [self-hosted, linux] + runs-on: ${{matrix.os}} steps: - - name: set permissions on work folder for self-runners - run: | - sudo chown -R $USER:$USER ~/actions-runner/_work/ + # - name: set permissions on work folder for self-runners + # run: | + # sudo chown -R $USER:$USER ~/actions-runner/_work/ - uses: actions/checkout@v3 diff --git a/.github/workflows/pr-tests-stack-public.yml b/.github/workflows/pr-tests-stack-public.yml index ea33c1f11bb..6911c81a5d1 100644 --- a/.github/workflows/pr-tests-stack-public.yml +++ b/.github/workflows/pr-tests-stack-public.yml @@ -125,7 +125,7 @@ jobs: - name: Docker on MacOS if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest' - uses: crazy-max/ghaction-setup-docker@v1.3.0 + uses: crazy-max/ghaction-setup-docker@v2.0.0 - name: Docker Compose on MacOS if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest' diff --git a/.github/workflows/pr-tests-stack.yml b/.github/workflows/pr-tests-stack.yml index b449aef57fa..3c87775d1cb 100644 --- a/.github/workflows/pr-tests-stack.yml +++ b/.github/workflows/pr-tests-stack.yml @@ -27,7 +27,8 @@ jobs: max-parallel: 99 matrix: # os: [ubuntu-latest, macos-latest, windows-latest, windows] - os: [om-ci-16vcpu-ubuntu2204] + # os: [om-ci-16vcpu-ubuntu2204] + os: [ubuntu-latest] python-version: ["3.11"] pytest-modules: ["frontend network"] fail-fast: false @@ -35,16 +36,17 @@ jobs: runs-on: ${{matrix.os}} steps: - - name: Permission to home directory - run: | - sudo chown -R $USER:$USER $HOME - - name: "clean .git/config" - if: matrix.os == 'windows' - continue-on-error: true - shell: bash - run: | - echo "deleting ${GITHUB_WORKSPACE}/.git/config" - rm ${GITHUB_WORKSPACE}/.git/config + # - name: Permission to home directory + # run: | + # sudo chown -R $USER:$USER $HOME + + # - name: "clean .git/config" + # if: matrix.os == 'windows' + # continue-on-error: true + # shell: bash + # run: | + # echo "deleting ${GITHUB_WORKSPACE}/.git/config" + # rm ${GITHUB_WORKSPACE}/.git/config - uses: actions/checkout@v3 @@ -137,7 +139,7 @@ jobs: - name: Docker on MacOS if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest' - uses: crazy-max/ghaction-setup-docker@v1.3.0 + uses: crazy-max/ghaction-setup-docker@v2.0.0 - name: Docker Compose on MacOS if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest' @@ -348,7 +350,7 @@ jobs: - name: Docker on MacOS if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest' - uses: crazy-max/ghaction-setup-docker@v1.3.0 + uses: crazy-max/ghaction-setup-docker@v2.0.0 - name: Docker Compose on MacOS if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest' diff --git a/.github/workflows/pr-tests-syft.yml b/.github/workflows/pr-tests-syft.yml index 82e9a2b87f7..537801d5b77 100644 --- a/.github/workflows/pr-tests-syft.yml +++ b/.github/workflows/pr-tests-syft.yml @@ -98,7 +98,7 @@ jobs: - name: Docker on MacOS if: steps.changes.outputs.syft == 'true' && matrix.os == 'macos-13' - uses: crazy-max/ghaction-setup-docker@v1.3.0 + uses: crazy-max/ghaction-setup-docker@v2.0.0 - name: Run unit tests if: steps.changes.outputs.syft == 'true' @@ -276,7 +276,7 @@ jobs: - name: Docker on MacOS if: (steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true') && matrix.os == 'macos-latest' - uses: crazy-max/ghaction-setup-docker@v1.3.0 + uses: crazy-max/ghaction-setup-docker@v2.0.0 - name: Docker Compose on MacOS if: (steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true') && matrix.os == 'macos-latest' diff --git a/VERSION b/VERSION index bc9a2b2618d..e8c2873959e 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ # Mono Repo Global Version -__version__ = "0.8.2-beta.30" +__version__ = "0.8.2-beta.31" # elsewhere we can call this file: `python VERSION` and simply take the stdout # stdlib diff --git a/notebooks/Experimental/test.ipynb b/notebooks/Experimental/test.ipynb deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/packages/grid/VERSION b/packages/grid/VERSION index bc9a2b2618d..e8c2873959e 100644 --- a/packages/grid/VERSION +++ b/packages/grid/VERSION @@ -1,5 +1,5 @@ # Mono Repo Global Version -__version__ = "0.8.2-beta.30" +__version__ = "0.8.2-beta.31" # elsewhere we can call this file: `python VERSION` and simply take the stdout # stdlib diff --git a/packages/grid/backend/JAX.MD b/packages/grid/backend/JAX.MD index b0ba39b2bf5..c727621c10e 100644 --- a/packages/grid/backend/JAX.MD +++ b/packages/grid/backend/JAX.MD @@ -4,8 +4,12 @@ Create a high CPU linux x86 machine. I used 32 CPUs on Azure and compilation too Once the latest docker is setup run the following steps. +It is recommended to build on an ARM machine to conserve on time. + ## Create a buildx builder for arm64 +Perform this step if you are building on an `x86` machine or else skip it + ``` $ docker buildx create --platform linux/arm64 --name arm64builder $ docker buildx use arm64builder @@ -13,6 +17,8 @@ $ docker buildx use arm64builder ## Install the QEMU arm64 emulator layers so you can run the container +Perform this step if you are building on an `x86` machine or else skip it + ``` $ docker run --privileged --rm tonistiigi/binfmt --install arm64 $ docker run --rm --privileged multiarch/qemu-user-static --reset -p yes @@ -59,6 +65,7 @@ $ git checkout tags/jaxlib-v0.4.10 -b jaxlib-v0.4.10 ## Start the build ``` +$ export JAXLIB_RELEASE=True # needed to prevent dev tagging in version $ python3 /jax/build/build.py --target_cpu_features native ``` diff --git a/packages/grid/backend/backend.dockerfile b/packages/grid/backend/backend.dockerfile index 11d75cb747b..3c7cc34ed15 100644 --- a/packages/grid/backend/backend.dockerfile +++ b/packages/grid/backend/backend.dockerfile @@ -25,8 +25,8 @@ RUN --mount=type=cache,target=/root/.cache \ # copy precompiled arm64 packages COPY grid/backend/wheels /wheels RUN --mount=type=cache,target=/root/.cache if [ $(uname -m) != "x86_64" ]; then \ - pip install --user /wheels/jaxlib-0.4.10-cp311-cp311-manylinux2014_aarch64.whl; \ - pip install --user jax==0.4.10; \ + pip install --user /wheels/jaxlib-0.4.16-cp311-cp311-manylinux2014_aarch64.whl; \ + pip install --user jax==0.4.16; \ fi WORKDIR /app diff --git a/packages/grid/backend/build_jax.dockerfile b/packages/grid/backend/build_jax.dockerfile index 85b186f1677..411ef338183 100644 --- a/packages/grid/backend/build_jax.dockerfile +++ b/packages/grid/backend/build_jax.dockerfile @@ -11,7 +11,7 @@ RUN apt-get -y install \ python3 \ python3-dev \ python3-pip -RUN pip3 install --upgrade pip setuptools numpy wheel +RUN pip3 install --upgrade pip setuptools numpy wheel build RUN git clone https://github.com/google/jax.git CMD ["bash"] diff --git a/packages/grid/backend/wheels/jaxlib-0.4.10-cp311-cp311-manylinux2014_aarch64.whl b/packages/grid/backend/wheels/jaxlib-0.4.16-cp311-cp311-manylinux2014_aarch64.whl similarity index 77% rename from packages/grid/backend/wheels/jaxlib-0.4.10-cp311-cp311-manylinux2014_aarch64.whl rename to packages/grid/backend/wheels/jaxlib-0.4.16-cp311-cp311-manylinux2014_aarch64.whl index 3afdb88c012..4a8b549e28d 100644 Binary files a/packages/grid/backend/wheels/jaxlib-0.4.10-cp311-cp311-manylinux2014_aarch64.whl and b/packages/grid/backend/wheels/jaxlib-0.4.16-cp311-cp311-manylinux2014_aarch64.whl differ diff --git a/packages/grid/devspace.yaml b/packages/grid/devspace.yaml index 5b150d2203c..7a58a689228 100644 --- a/packages/grid/devspace.yaml +++ b/packages/grid/devspace.yaml @@ -15,13 +15,13 @@ pipelines: run: |- run_dependencies --all ensure_pull_secrets --all - build_images --all -t $(git rev-parse --short=6 HEAD) -t 0.8.2-beta.30 -t dev-latest + build_images --all -t $(git rev-parse --short=6 HEAD) -t 0.8.2-beta.31 -t dev-latest create_deployments --all vars: DEVSPACE_ENV_FILE: "default.env" CONTAINER_REGISTRY: "docker.io" - VERSION: "0.8.2-beta.30" + VERSION: "0.8.2-beta.31" # This is a list of `images` that DevSpace can build for this project # We recommend to skip image building during development (devspace dev) as much as possible diff --git a/packages/grid/frontend/package.json b/packages/grid/frontend/package.json index df6d0b23cdc..bae96f042d3 100644 --- a/packages/grid/frontend/package.json +++ b/packages/grid/frontend/package.json @@ -1,6 +1,6 @@ { "name": "pygrid-ui", - "version": "0.8.2-beta.30", + "version": "0.8.2-beta.31", "private": true, "scripts": { "dev": "pnpm i && vite dev --host --port 80", diff --git a/packages/grid/helm/repo/index.yaml b/packages/grid/helm/repo/index.yaml index ef30d78880d..fa4958e1359 100644 --- a/packages/grid/helm/repo/index.yaml +++ b/packages/grid/helm/repo/index.yaml @@ -1,9 +1,25 @@ apiVersion: v1 entries: syft: + - apiVersion: v2 + appVersion: 0.8.2-beta.31 + created: "2023-09-22T06:33:05.972438781Z" + dependencies: + - name: component-chart + repository: https://charts.devspace.sh + version: 0.8.6 + description: Perform numpy-like analysis on data that remains in someone elses + server + digest: 5f3e7ddc72dbf3991f4546925d661e8066b3a703329cd35cd68d66f6f70ab260 + icon: https://raw.githubusercontent.com/OpenMined/PySyft/dev/docs/img/title_syft_light.png + name: syft + type: application + urls: + - https://openmined.github.io/PySyft/helm/syft-0.8.2-beta.31.tgz + version: 0.8.2-beta.31 - apiVersion: v2 appVersion: 0.8.2-beta.30 - created: "2023-09-19T05:46:36.630573249Z" + created: "2023-09-22T06:33:05.97194548Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -19,7 +35,7 @@ entries: version: 0.8.2-beta.30 - apiVersion: v2 appVersion: 0.8.2-beta.29 - created: "2023-09-19T05:46:36.62958178Z" + created: "2023-09-22T06:33:05.970951154Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -35,7 +51,7 @@ entries: version: 0.8.2-beta.29 - apiVersion: v2 appVersion: 0.8.2-beta.28 - created: "2023-09-19T05:46:36.629078251Z" + created: "2023-09-22T06:33:05.970430332Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -51,7 +67,7 @@ entries: version: 0.8.2-beta.28 - apiVersion: v2 appVersion: 0.8.2-beta.27 - created: "2023-09-19T05:46:36.628566767Z" + created: "2023-09-22T06:33:05.969838718Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -67,7 +83,7 @@ entries: version: 0.8.2-beta.27 - apiVersion: v2 appVersion: 0.8.2-beta.26 - created: "2023-09-19T05:46:36.628034665Z" + created: "2023-09-22T06:33:05.968583044Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -83,7 +99,7 @@ entries: version: 0.8.2-beta.26 - apiVersion: v2 appVersion: 0.8.2-beta.25 - created: "2023-09-19T05:46:36.627465343Z" + created: "2023-09-22T06:33:05.968013221Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -99,7 +115,7 @@ entries: version: 0.8.2-beta.25 - apiVersion: v2 appVersion: 0.8.2-beta.24 - created: "2023-09-19T05:46:36.626266408Z" + created: "2023-09-22T06:33:05.967506125Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -115,7 +131,7 @@ entries: version: 0.8.2-beta.24 - apiVersion: v2 appVersion: 0.8.2-beta.23 - created: "2023-09-19T05:46:36.625767417Z" + created: "2023-09-22T06:33:05.967022231Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -131,7 +147,7 @@ entries: version: 0.8.2-beta.23 - apiVersion: v2 appVersion: 0.8.2-beta.22 - created: "2023-09-19T05:46:36.625257767Z" + created: "2023-09-22T06:33:05.966541814Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -147,7 +163,7 @@ entries: version: 0.8.2-beta.22 - apiVersion: v2 appVersion: 0.8.2-beta.21 - created: "2023-09-19T05:46:36.624751312Z" + created: "2023-09-22T06:33:05.966060807Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -163,7 +179,7 @@ entries: version: 0.8.2-beta.21 - apiVersion: v2 appVersion: 0.8.2-beta.20 - created: "2023-09-19T05:46:36.624228106Z" + created: "2023-09-22T06:33:05.965568708Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -179,7 +195,7 @@ entries: version: 0.8.2-beta.20 - apiVersion: v2 appVersion: 0.8.2-beta.19 - created: "2023-09-19T05:46:36.623189289Z" + created: "2023-09-22T06:33:05.964536071Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -195,7 +211,7 @@ entries: version: 0.8.2-beta.19 - apiVersion: v2 appVersion: 0.8.2-beta.18 - created: "2023-09-19T05:46:36.622687122Z" + created: "2023-09-22T06:33:05.963997516Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -211,7 +227,7 @@ entries: version: 0.8.2-beta.18 - apiVersion: v2 appVersion: 0.8.2-beta.17 - created: "2023-09-19T05:46:36.62218189Z" + created: "2023-09-22T06:33:05.963462206Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -227,7 +243,7 @@ entries: version: 0.8.2-beta.17 - apiVersion: v2 appVersion: 0.8.2-beta.16 - created: "2023-09-19T05:46:36.621662151Z" + created: "2023-09-22T06:33:05.962883947Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -243,7 +259,7 @@ entries: version: 0.8.2-beta.16 - apiVersion: v2 appVersion: 0.8.2-beta.15 - created: "2023-09-19T05:46:36.621139687Z" + created: "2023-09-22T06:33:05.961941004Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -259,7 +275,7 @@ entries: version: 0.8.2-beta.15 - apiVersion: v2 appVersion: 0.8.2-beta.14 - created: "2023-09-19T05:46:36.620598277Z" + created: "2023-09-22T06:33:05.961219287Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -275,7 +291,7 @@ entries: version: 0.8.2-beta.14 - apiVersion: v2 appVersion: 0.8.2-beta.13 - created: "2023-09-19T05:46:36.619533423Z" + created: "2023-09-22T06:33:05.960689047Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -291,7 +307,7 @@ entries: version: 0.8.2-beta.13 - apiVersion: v2 appVersion: 0.8.2-beta.12 - created: "2023-09-19T05:46:36.618997874Z" + created: "2023-09-22T06:33:05.960176621Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -307,7 +323,7 @@ entries: version: 0.8.2-beta.12 - apiVersion: v2 appVersion: 0.8.2-beta.11 - created: "2023-09-19T05:46:36.618494896Z" + created: "2023-09-22T06:33:05.95957576Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -323,7 +339,7 @@ entries: version: 0.8.2-beta.11 - apiVersion: v2 appVersion: 0.8.2-beta.10 - created: "2023-09-19T05:46:36.617921486Z" + created: "2023-09-22T06:33:05.959011136Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -339,7 +355,7 @@ entries: version: 0.8.2-beta.10 - apiVersion: v2 appVersion: 0.8.2-beta.9 - created: "2023-09-19T05:46:36.634111428Z" + created: "2023-09-22T06:33:05.97540098Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -355,7 +371,7 @@ entries: version: 0.8.2-beta.9 - apiVersion: v2 appVersion: 0.8.2-beta.8 - created: "2023-09-19T05:46:36.633177556Z" + created: "2023-09-22T06:33:05.974908541Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -371,7 +387,7 @@ entries: version: 0.8.2-beta.8 - apiVersion: v2 appVersion: 0.8.2-beta.7 - created: "2023-09-19T05:46:36.632596813Z" + created: "2023-09-22T06:33:05.974425088Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -387,7 +403,7 @@ entries: version: 0.8.2-beta.7 - apiVersion: v2 appVersion: 0.8.2-beta.6 - created: "2023-09-19T05:46:36.63209121Z" + created: "2023-09-22T06:33:05.973945163Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -403,7 +419,7 @@ entries: version: 0.8.2-beta.6 - apiVersion: v2 appVersion: 0.8.2-beta.5 - created: "2023-09-19T05:46:36.631590025Z" + created: "2023-09-22T06:33:05.973457753Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -419,7 +435,7 @@ entries: version: 0.8.2-beta.5 - apiVersion: v2 appVersion: 0.8.2-beta.4 - created: "2023-09-19T05:46:36.63106725Z" + created: "2023-09-22T06:33:05.972965895Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -435,7 +451,7 @@ entries: version: 0.8.2-beta.4 - apiVersion: v2 appVersion: 0.8.2-beta.3 - created: "2023-09-19T05:46:36.630077174Z" + created: "2023-09-22T06:33:05.971448132Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -451,7 +467,7 @@ entries: version: 0.8.2-beta.3 - apiVersion: v2 appVersion: 0.8.2-beta.2 - created: "2023-09-19T05:46:36.623723004Z" + created: "2023-09-22T06:33:05.965069436Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -467,7 +483,7 @@ entries: version: 0.8.2-beta.2 - apiVersion: v2 appVersion: 0.8.2-beta.1 - created: "2023-09-19T05:46:36.617384485Z" + created: "2023-09-22T06:33:05.958499771Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -483,7 +499,7 @@ entries: version: 0.8.2-beta.1 - apiVersion: v2 appVersion: 0.8.1 - created: "2023-09-19T05:46:36.616832085Z" + created: "2023-09-22T06:33:05.957976755Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -499,7 +515,7 @@ entries: version: 0.8.1 - apiVersion: v2 appVersion: 0.8.1-beta.21 - created: "2023-09-19T05:46:36.616307567Z" + created: "2023-09-22T06:33:05.957463557Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -515,7 +531,7 @@ entries: version: 0.8.1-beta.21 - apiVersion: v2 appVersion: 0.8.1-beta.20 - created: "2023-09-19T05:46:36.615755497Z" + created: "2023-09-22T06:33:05.956910635Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -531,7 +547,7 @@ entries: version: 0.8.1-beta.20 - apiVersion: v2 appVersion: 0.8.1-beta.19 - created: "2023-09-19T05:46:36.615185214Z" + created: "2023-09-22T06:33:05.956290227Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -547,7 +563,7 @@ entries: version: 0.8.1-beta.19 - apiVersion: v2 appVersion: 0.8.1-beta.15 - created: "2023-09-19T05:46:36.614634266Z" + created: "2023-09-22T06:33:05.955080759Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -563,7 +579,7 @@ entries: version: 0.8.1-beta.15 - apiVersion: v2 appVersion: 0.8.1-beta.12 - created: "2023-09-19T05:46:36.614016324Z" + created: "2023-09-22T06:33:05.954540721Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -577,4 +593,4 @@ entries: urls: - https://openmined.github.io/PySyft/helm/syft-0.8.1-beta.12.tgz version: 0.8.1-beta.12 -generated: "2023-09-19T05:46:36.612625044Z" +generated: "2023-09-22T06:33:05.953845634Z" diff --git a/packages/grid/helm/repo/syft-0.8.2-beta.31.tgz b/packages/grid/helm/repo/syft-0.8.2-beta.31.tgz new file mode 100644 index 00000000000..208efd8edbe Binary files /dev/null and b/packages/grid/helm/repo/syft-0.8.2-beta.31.tgz differ diff --git a/packages/grid/helm/syft/Chart.yaml b/packages/grid/helm/syft/Chart.yaml index 1dc05f1fa80..91db2a35105 100644 --- a/packages/grid/helm/syft/Chart.yaml +++ b/packages/grid/helm/syft/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: syft description: Perform numpy-like analysis on data that remains in someone elses server type: application -version: "0.8.2-beta.30" -appVersion: "0.8.2-beta.30" +version: "0.8.2-beta.31" +appVersion: "0.8.2-beta.31" icon: https://raw.githubusercontent.com/OpenMined/PySyft/dev/docs/img/title_syft_light.png dependencies: diff --git a/packages/grid/podman/podman-kube/podman-syft-kube.yaml b/packages/grid/podman/podman-kube/podman-syft-kube.yaml index c789c55b7c0..03286ac7cfd 100644 --- a/packages/grid/podman/podman-kube/podman-syft-kube.yaml +++ b/packages/grid/podman/podman-kube/podman-syft-kube.yaml @@ -41,7 +41,7 @@ spec: - configMapRef: name: podman-syft-config - image: docker.io/openmined/grid-backend:0.8.2-beta.30 + image: docker.io/openmined/grid-backend:0.8.2-beta.31 imagePullPolicy: IfNotPresent resources: {} tty: true @@ -57,7 +57,7 @@ spec: envFrom: - configMapRef: name: podman-syft-config - image: docker.io/openmined/grid-frontend:0.8.2-beta.30 + image: docker.io/openmined/grid-frontend:0.8.2-beta.31 imagePullPolicy: IfNotPresent resources: {} tty: true diff --git a/packages/grid/worker/worker.dockerfile b/packages/grid/worker/worker.dockerfile index c98bfeed3d7..d7b096687ee 100644 --- a/packages/grid/worker/worker.dockerfile +++ b/packages/grid/worker/worker.dockerfile @@ -21,8 +21,8 @@ RUN --mount=type=cache,target=/root/.cache \ # copy precompiled arm64 packages COPY grid/backend/wheels /wheels RUN --mount=type=cache,target=/root/.cache if [ $(uname -m) != "x86_64" ]; then \ - pip install --user /wheels/jaxlib-0.4.10-cp311-cp311-manylinux2014_aarch64.whl; \ - pip install --user jax==0.4.10; \ + pip install --user /wheels/jaxlib-0.4.16-cp311-cp311-manylinux2014_aarch64.whl; \ + pip install --user jax==0.4.16; \ fi WORKDIR /app diff --git a/packages/hagrid/hagrid/cli.py b/packages/hagrid/hagrid/cli.py index 17d67026b2b..4d4636aebcc 100644 --- a/packages/hagrid/hagrid/cli.py +++ b/packages/hagrid/hagrid/cli.py @@ -3153,7 +3153,7 @@ def create_land_cmd(verb: GrammarVerb, kwargs: TypeDict[str, Any]) -> str: # subprocess.call("docker rm `docker ps -aq` --force", shell=True) # nosec if "prune_vol" in kwargs: - return "docker rm `docker ps -aq` --force && docker volume prune" + return "docker rm `docker ps -aq` --force && docker volume prune -f" else: return "docker rm `docker ps -aq` --force" diff --git a/packages/hagrid/hagrid/deps.py b/packages/hagrid/hagrid/deps.py index 143e309e65b..bc778dafcf6 100644 --- a/packages/hagrid/hagrid/deps.py +++ b/packages/hagrid/hagrid/deps.py @@ -42,7 +42,7 @@ from .version import __version__ LATEST_STABLE_SYFT = "0.8.1" -LATEST_BETA_SYFT = "0.8.2-beta.30" +LATEST_BETA_SYFT = "0.8.2-beta.31" DOCKER_ERROR = """ You are running an old version of docker, possibly on Linux. You need to install v2. diff --git a/packages/hagrid/hagrid/manifest_template.yml b/packages/hagrid/hagrid/manifest_template.yml index 0b517425623..03d0fef03cd 100644 --- a/packages/hagrid/hagrid/manifest_template.yml +++ b/packages/hagrid/hagrid/manifest_template.yml @@ -1,9 +1,9 @@ manifestVersion: 0.1 hagrid_version: 0.3.72 -syft_version: 0.8.2-beta.30 -dockerTag: 0.8.2-beta.30 +syft_version: 0.8.2-beta.31 +dockerTag: 0.8.2-beta.31 baseUrl: https://raw.githubusercontent.com/OpenMined/PySyft/ -hash: f0d04c5e0a71295271f2fda2647a7bb9a0affe19 +hash: 00d4fb50c26820ed0fc84bb8c3047b6243f1473c target_dir: ~/.hagrid/PySyft/ files: grid: diff --git a/packages/syft/setup.cfg b/packages/syft/setup.cfg index bc055587bb4..79435cdaf96 100644 --- a/packages/syft/setup.cfg +++ b/packages/syft/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = syft -version = attr: "0.8.2-beta.30" +version = attr: "0.8.2-beta.31" description = Perform numpy-like analysis on data that remains in someone elses server author = OpenMined author_email = info@openmined.org @@ -31,8 +31,8 @@ syft = forbiddenfruit==0.1.4 gevent==22.10.2 gipc==1.5.0 - jaxlib>=0.4.10,<=0.4.14 - jax>=0.4.10,<=0.4.14 + jaxlib==0.4.16 + jax==0.4.16 loguru==0.7.0 networkx==2.8 numpy>=1.22.4,<=1.24.3 diff --git a/packages/syft/src/syft/VERSION b/packages/syft/src/syft/VERSION index bc9a2b2618d..e8c2873959e 100644 --- a/packages/syft/src/syft/VERSION +++ b/packages/syft/src/syft/VERSION @@ -1,5 +1,5 @@ # Mono Repo Global Version -__version__ = "0.8.2-beta.30" +__version__ = "0.8.2-beta.31" # elsewhere we can call this file: `python VERSION` and simply take the stdout # stdlib diff --git a/packages/syft/src/syft/__init__.py b/packages/syft/src/syft/__init__.py index 062d6edb25a..1527074d936 100644 --- a/packages/syft/src/syft/__init__.py +++ b/packages/syft/src/syft/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.8.2-beta.30" +__version__ = "0.8.2-beta.31" # stdlib import pathlib diff --git a/packages/syft/src/syft/client/client.py b/packages/syft/src/syft/client/client.py index 5e0879d34b5..53687d36381 100644 --- a/packages/syft/src/syft/client/client.py +++ b/packages/syft/src/syft/client/client.py @@ -604,6 +604,8 @@ def login( self.register( email=email, password=password, password_verify=password, **kwargs ) + if password is None: + password = getpass("Password: ") user_private_key = self.connection.login(email=email, password=password) if isinstance(user_private_key, SyftError): return user_private_key @@ -819,7 +821,10 @@ def login( connection = _client.connection login_credentials = None - if email and password: + + if email: + if not password: + password = getpass("Password: ") login_credentials = UserLoginCredentials(email=email, password=password) if login_credentials is None: diff --git a/packages/syftcli/manifest.yml b/packages/syftcli/manifest.yml index 36752ae6f8a..82a43fb667e 100644 --- a/packages/syftcli/manifest.yml +++ b/packages/syftcli/manifest.yml @@ -1,11 +1,11 @@ manifestVersion: 1.0 -syftVersion: 0.8.2-beta.30 -dockerTag: 0.8.2-beta.30 +syftVersion: 0.8.2-beta.31 +dockerTag: 0.8.2-beta.31 images: - - docker.io/openmined/grid-frontend:0.8.2-beta.30 - - docker.io/openmined/grid-backend:0.8.2-beta.30 + - docker.io/openmined/grid-frontend:0.8.2-beta.31 + - docker.io/openmined/grid-backend:0.8.2-beta.31 - docker.io/library/mongo:latest - docker.io/traefik:v2.10