Merge branch 'dev' into mongo-permission-model-tests

.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

.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

.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'

.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
 

.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'

.github/workflows/pr-tests-stack.yml

@@ -27,24 +27,26 @@ 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
 
     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'

.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'

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

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

packages/grid/backend/JAX.MD

@@ -4,15 +4,21 @@ 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
 ```
 
 ## 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
 ```
 

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

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"]

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

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",