Skip to content

Commit

Permalink
Merge branch 'dev' into feat/notifications_object_repr
Browse files Browse the repository at this point in the history
  • Loading branch information
tcp authored Sep 25, 2023
2 parents 59cfe95 + ba22894 commit bb3169b
Show file tree
Hide file tree
Showing 32 changed files with 173 additions and 103 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/nightlies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/pr-tests-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr-tests-stack-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-tests-stack-public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
28 changes: 15 additions & 13 deletions .github/workflows/pr-tests-stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-tests-syft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Empty file removed notebooks/Experimental/test.ipynb
Empty file.
2 changes: 1 addition & 1 deletion packages/grid/VERSION
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 7 additions & 0 deletions packages/grid/backend/JAX.MD
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
```

Expand Down
4 changes: 2 additions & 2 deletions packages/grid/backend/backend.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/backend/build_jax.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
Binary file not shown.
4 changes: 2 additions & 2 deletions packages/grid/devspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/frontend/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Loading

0 comments on commit bb3169b

Please sign in to comment.