Remove xformers as it breaks injections module on mac

whylabs · Oct 13, 2023 · ccb6f61 · ccb6f61
1 parent 588fd13
commit ccb6f61
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/langkit-ci.yml b/.github/workflows/langkit-ci.yml
@@ -31,12 +31,12 @@ jobs:
         name: Cache dependencies based on poetry.lock file
         with:
           path: ./.venv
-          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
+          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-all-${{ hashFiles('**/poetry.lock') }}
       - name: check poetry env
         run: poetry env info
       - name: Install dependencies
         if: steps.poetry-cache.outputs.cache-hit != 'true'
-        run: poetry install
+        run: make install
       - name: Log cache hit
         if: steps.poetry-cache.outputs.cache-hit == 'true'
         run: echo 'poetry cache hit, skipping poetry install'

diff --git a/.github/workflows/push-release.yml b/.github/workflows/push-release.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Install Poetry
         uses: abatilo/actions-poetry@v2.0.0
         with:
-          poetry-version: 1.5.1
+          poetry-version: 1.6.1
       - name: Set up Python
         uses: actions/setup-python@v4
         with:

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -21,7 +21,7 @@ numpy = [
   { version = "*", python = "<3.11", optional = true },
   { version = ">=1.23.2", python = ">=3.11", optional = true }
 ]
-xformers = {version = "*", python=">=3.8.0,<4", optional = true}
+xformers = {version = "*", platform="!macos", python=">=3.8.0,<4", optional = true}
 datasets = {version ="^2.12.0", optional = true}
 openai = {version ="^0.27.6", optional = true}
 nltk = {version ="^3.8.1", optional = true}
@@ -30,6 +30,7 @@ evaluate = {version = "^0.4.0", optional = true}
 faiss-cpu = {version = "^1.7.1", optional = true}
 ipywidgets = {version = "^8.1.1", optional = true}
 
+
 [tool.poetry.group.dev.dependencies]
 ipykernel = { version = ">=6.25.2", python = ">=3.8.1,<4" }
 pytest =  { version ="^7.3.1", python = ">=3.8.1,<4" }
@@ -44,7 +45,6 @@ bump2version = { version = "^1.0.1", python = ">=3.8.1,<4" }
 all = [
     "torch",
     "numpy",
-    "xformers",
     "datasets",
     "openai",
     "nltk",
@@ -54,7 +54,6 @@ all = [
     "ipywidgets",
 ]
 
-
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"