Merge pull request #8063 from madhavajay/madhava/jaxlib

Upgrading jaxlib==0.4.14

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

@@ -70,7 +70,6 @@ jobs:
         if: steps.changes.outputs.syft == 'true'
         run: |
           pip install --upgrade tox packaging wheel --default-timeout=60
-          python -c "import platform; import os; os.system('pip install jaxlib==0.4.10 -f https://whls.blob.core.windows.net/unstable/index.html') if platform.system().lower() == 'windows' else ''"
 
       # Temporarily disabled oblv tests
       # - name: Run Enclave tests

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

@@ -106,11 +106,6 @@ jobs:
         with:
           args: install visualstudio2019-workload-vctools -y
 
-      - name: Install jaxlib
-        if: steps.changes.outputs.stack == 'true' && matrix.os == 'windows'
-        run: |
-          python -c "import platform; import os; os.system('pip install jaxlib==0.4.10 -f https://whls.blob.core.windows.net/unstable/index.html') if platform.system().lower() == 'windows' else ''"
-
       - name: Install Docker Compose
         if: steps.changes.outputs.stack == 'true' && runner.os == 'Linux'
         shell: bash

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

@@ -118,11 +118,6 @@ jobs:
         with:
           args: install visualstudio2019-workload-vctools -y
 
-      - name: Install jaxlib
-        if: steps.changes.outputs.stack == 'true' && matrix.os == 'windows'
-        run: |
-          python -c "import platform; import os; os.system('pip install jaxlib==0.4.10 -f https://whls.blob.core.windows.net/unstable/index.html') if platform.system().lower() == 'windows' else ''"
-
       - name: Install Docker Compose
         if: steps.changes.outputs.stack == 'true' && runner.os == 'Linux'
         shell: bash
@@ -334,11 +329,6 @@ jobs:
         with:
           args: install visualstudio2019-workload-vctools -y
 
-      - name: Install jaxlib
-        if: steps.changes.outputs.stack == 'true' && matrix.os == 'windows'
-        run: |
-          python -c "import platform; import os; os.system('pip install jaxlib==0.4.10 -f https://whls.blob.core.windows.net/unstable/index.html') if platform.system().lower() == 'windows' else ''"
-
       - name: Install Docker Compose
         if: steps.changes.outputs.stack == 'true' && runner.os == 'Linux'
         shell: bash

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

@@ -87,7 +87,6 @@ jobs:
         if: steps.changes.outputs.syft == 'true'
         run: |
           pip install --upgrade tox packaging wheel --default-timeout=60
-          python -c "import platform; import os; os.system('pip install jaxlib==0.4.10 -f https://whls.blob.core.windows.net/unstable/index.html') if platform.system().lower() == 'windows' else ''"
 
       - name: Fix Colima issue on MacOS Runners
         if: steps.changes.outputs.syft == 'true' && matrix.os == 'macos-13'
@@ -179,7 +178,6 @@ jobs:
         if: steps.changes.outputs.syft == 'true'  || steps.changes.outputs.notebooks == 'true'
         run: |
           pip install --upgrade tox packaging wheel --default-timeout=60
-          python -c "import platform; import os; os.system('pip install jaxlib==0.4.10 -f https://whls.blob.core.windows.net/unstable/index.html') if platform.system().lower() == 'windows' else ''"
 
       - name: Run notebook tests
         uses: nick-fields/retry@v2
@@ -249,7 +247,6 @@ jobs:
         if: steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true'
         run: |
           pip install --upgrade tox packaging wheel --default-timeout=60
-          python -c "import platform; import os; os.system('pip install jaxlib==0.4.10 -f https://whls.blob.core.windows.net/unstable/index.html') if platform.system().lower() == 'windows' else ''"
 
       - name: Docker Compose on Linux
         if: (steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true') && matrix.os == 'ubuntu-latest'
@@ -356,7 +353,6 @@ jobs:
         if: steps.changes.outputs.syft == 'true'
         run: |
           pip install --upgrade tox packaging wheel --default-timeout=60
-          python -c "import platform; import os; os.system('pip install jaxlib==0.4.10 -f https://whls.blob.core.windows.net/unstable/index.html') if platform.system().lower() == 'windows' else ''"
 
       - name: Scan for security issues
         if: steps.changes.outputs.syft == 'true'

README.md

@@ -10,12 +10,12 @@ Perform data science on `data` that remains in `someone else's` server
 
 # Quickstart
 
-✅ `Linux` ✅ `macOS` ✅ `Windows`\* ✅ `Docker` ✅ `Kubernetes`
+✅ `Linux` ✅ `macOS` ✅ `Windows` ✅ `Docker` ✅ `Podman` ✅ `Kubernetes`
 
 ## Install Client
 
 ```bash
-$ pip install -U syft -f https://whls.blob.core.windows.net/unstable/index.html
+$ pip install -U syft
 ```
 
 ## Launch Server
@@ -93,9 +93,8 @@ $ helm install ... --set ingress.ingressClass="gce"
 
 - HAGrid 0.3 Requires: 🐍 `python` 🐙 `git` - Run: `pip install -U hagrid`
 - Interactive Install 🧙🏽‍♂️ Wizard<sup>BETA</sup> Requires 🛵 `hagrid`: - Run: `hagrid quickstart`
-- PySyft 0.8.1 Requires: 🐍 `python 3.9 - 3.11` - Run: `pip install -U syft`  
-  \*`Windows` users must run this first: `pip install jaxlib==0.4.10 -f https://whls.blob.core.windows.net/unstable/index.html`
-- PyGrid Requires: 🐳 `docker`, ☸️ `kubernetes` or 🐧 `ubuntu` VM - Run: `hagrid launch ...`
+- PySyft 0.8.1 Requires: 🐍 `python 3.9 - 3.11` - Run: `pip install -U syft`
+- PyGrid Requires: 🐳 `docker`, 🦦 `podman` or ☸️ `kubernetes` - Run: `hagrid launch ...`
 
 # Versions
 

notebooks/api/0.8/00-load-data.ipynb

@@ -32,7 +32,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/api/0.8/01-submit-code.ipynb

@@ -24,7 +24,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/api/0.8/02-review-code-and-approve.ipynb

@@ -24,7 +24,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/api/0.8/03-data-scientist-download-result.ipynb

@@ -24,7 +24,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/api/0.8/04-jax-example.ipynb

@@ -11,7 +11,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/api/0.8/05-custom-policy.ipynb

@@ -11,7 +11,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/api/0.8/06-multiple-code-requests.ipynb

@@ -11,7 +11,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/api/0.8/07-domain-register-control-flow.ipynb

@@ -27,7 +27,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/api/0.8/08-code-version.ipynb

@@ -22,7 +22,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "%pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "%pip install {package_string} -q"
    ]
   },
   {

notebooks/api/0.8/09-blob-storage.ipynb

@@ -8,7 +8,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/tutorials/data-owner/01-uploading-private-data.ipynb

@@ -27,7 +27,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/tutorials/data-owner/02-account-management.ipynb

@@ -25,7 +25,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/tutorials/data-owner/03-messages-and-requests.ipynb

@@ -25,7 +25,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/tutorials/data-owner/05-syft-services-api.ipynb

@@ -25,7 +25,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/tutorials/data-scientist/01-installing-syft-client.ipynb

@@ -75,14 +75,12 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "id": "77e1b18d",
    "metadata": {},
    "source": [
-    "`Linux`, `macOS` and `Windows` are supported.\n",
-    "\n",
-    "* `macOS` Apple Silicon users might need cmake: `brew install cmake` \n",
-    "* `Windows` users must run this first: `pip install jaxlib==0.4.10 -f https://whls.blob.core.windows.net/unstable/index.html`"
+    "`Linux`, `macOS` and `Windows` are supported."
    ]
   },
   {

notebooks/tutorials/data-scientist/03-working-with-private-datasets.ipynb

@@ -25,7 +25,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/tutorials/data-scientist/05-syft-functions.ipynb

@@ -25,7 +25,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html"
+    "# %pip install {package_string} -q"
    ]
   },
   {
@@ -198,7 +198,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/tutorials/data-scientist/06-messaging-and-requests.ipynb

@@ -25,7 +25,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/tutorials/hello-syft/01-hello-syft.ipynb

@@ -58,7 +58,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/tutorials/model-auditing/colab/01-user-log.ipynb

@@ -46,7 +46,7 @@
     "# install syft\n",
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "%pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "%pip install {package_string} -q"
    ]
   },
   {

notebooks/tutorials/pandas-cookbook/01-reading-from-a-csv.ipynb

@@ -27,7 +27,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/tutorials/pandas-cookbook/02-selecting-data-finding-common-complain.ipynb

@@ -27,7 +27,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/tutorials/pandas-cookbook/03-which-borough-has-the-most-noise-complaints.ipynb

@@ -27,7 +27,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/tutorials/pandas-cookbook/04-weekday-bike-most-groupby-aggregate.ipynb

@@ -19,7 +19,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/tutorials/pandas-cookbook/05-combining-dataframes-scraping-weather-data.ipynb

@@ -27,7 +27,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/tutorials/pandas-cookbook/06-string-operations-which-month-was-the-snowiest.ipynb

@@ -27,7 +27,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/tutorials/pandas-cookbook/07-cleaning-up-messy-data.ipynb

@@ -27,7 +27,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "# %pip install {package_string} -q"
    ]
   },
   {

notebooks/tutorials/pandas-cookbook/08-how-to-deal-with-timestamps.ipynb

@@ -29,7 +29,7 @@
    "source": [
     "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
-    "# %pip install {package_string} -f https://whls.blob.core.windows.net/unstable/index.html -q"
+    "# %pip install {package_string} -q"
    ]
   },
   {

packages/hagrid/hagrid/deps.py

@@ -114,8 +114,7 @@ class DependencySyftOS(Dependency):
     def check(self) -> None:
         self.display = "✅ " + ENVIRONMENT["os"]
         if is_windows():
-            if not get_pip_package("jaxlib"):
-                self.issues.append(windows_jaxlib())
+            pass
         elif is_apple_silicon():
             pass
 
@@ -918,15 +917,3 @@ def python_version_unsupported() -> SetupIssue:
         command="",
         solution="You must install a compatible version of Python",
     )
-
-
-WINDOWS_JAXLIB_REPO = "https://whls.blob.core.windows.net/unstable/index.html"
-
-
-def windows_jaxlib() -> SetupIssue:
-    return SetupIssue(
-        issue_name="windows_jaxlib",
-        description="Windows Python Wheels for Jax are not available on PyPI yet",
-        command=f"pip install jaxlib==0.4.10 -f {WINDOWS_JAXLIB_REPO}",
-        solution="Windows users must install jaxlib before syft",
-    )