From 7a4cb5e5bf1a0f6e14521abb0869c256202c7ee2 Mon Sep 17 00:00:00 2001
From: Vibhu Jawa <vibhujawa@gmail.com>
Date: Tue, 8 Oct 2024 17:30:33 -0700
Subject: [PATCH 1/6] Fix logging

---
 crossfit/op/base.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/crossfit/op/base.py b/crossfit/op/base.py
index d9ea28d..2e9557a 100644
--- a/crossfit/op/base.py
+++ b/crossfit/op/base.py
@@ -26,7 +26,10 @@ def __init__(self, pre=None, cols=False, keep_cols=None):
         self.pre = pre
         self.cols = cols
         self.keep_cols = keep_cols or []
-        self.worker_name = getattr(self.get_worker(), "name", 0)
+
+    @property
+    def worker_name(self):
+        return getattr(self.get_worker(), "name", 0)
 
     def setup(self):
         pass

From bd20039f613b4918af1f7ba8164750acb02d50e7 Mon Sep 17 00:00:00 2001
From: Vibhu Jawa <vibhujawa@gmail.com>
Date: Tue, 8 Oct 2024 17:53:18 -0700
Subject: [PATCH 2/6] Fix torch CI GPU issue

---
 ci/test_gpu.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/test_gpu.sh b/ci/test_gpu.sh
index 606f19c..1f1ad5e 100755
--- a/ci/test_gpu.sh
+++ b/ci/test_gpu.sh
@@ -18,7 +18,7 @@ fi
 echo "Installing pytorch,transformers and pytest to the environment for crossfit tests..."
 mamba install \
   cuda-version=$CUDA_VERSION \
-  conda-forge::pytorch \
+  conda-forge::pytorch>=2.0=*cuda* \
   conda-forge::transformers \
   conda-forge::pytest \
   -c conda-forge \

From efbc828cabfc3840172f5e381dfcc31cd08655f5 Mon Sep 17 00:00:00 2001
From: Vibhu Jawa <vibhujawa@gmail.com>
Date: Tue, 8 Oct 2024 18:13:39 -0700
Subject: [PATCH 3/6] Fix CI GPU install problem

---
 ci/test_gpu.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ci/test_gpu.sh b/ci/test_gpu.sh
index 1f1ad5e..ca91282 100755
--- a/ci/test_gpu.sh
+++ b/ci/test_gpu.sh
@@ -21,15 +21,12 @@ mamba install \
   conda-forge::pytorch>=2.0=*cuda* \
   conda-forge::transformers \
   conda-forge::pytest \
+  conda-forge::sentence-transformers  \
+  conda-forge::sentencepiece \
   -c conda-forge \
   --override-channels \
   --yes
 
-# Have to install sentence-transformers from pip
-# because conda-forge leads to a torch vision conflict
-# which leads to it being installed on CPUs
-pip3 install sentence-transformers sentencepiece
-
 # Install the crossfit package in editable mode with test dependencies
 pip3 install -e '.[test]'
 # Running tests

From a88e004995ab298fd5759f6cbbf996de11e9d82f Mon Sep 17 00:00:00 2001
From: Vibhu Jawa <vibhujawa@gmail.com>
Date: Tue, 8 Oct 2024 20:48:04 -0700
Subject: [PATCH 4/6] One more attempt to fix  torch CI GPU issue

---
 ci/test_gpu.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/test_gpu.sh b/ci/test_gpu.sh
index ca91282..1b8f2da 100755
--- a/ci/test_gpu.sh
+++ b/ci/test_gpu.sh
@@ -18,13 +18,13 @@ fi
 echo "Installing pytorch,transformers and pytest to the environment for crossfit tests..."
 mamba install \
   cuda-version=$CUDA_VERSION \
-  conda-forge::pytorch>=2.0=*cuda* \
-  conda-forge::transformers \
-  conda-forge::pytest \
-  conda-forge::sentence-transformers  \
-  conda-forge::sentencepiece \
+  "pytorch>=2.0,<=*cuda*"
+  transformers \
+  pytest \
+  sentence-transformers  \
+  sentencepiece \
   -c conda-forge \
-  --override-channels \
+  -c nvidia \
   --yes
 
 # Install the crossfit package in editable mode with test dependencies

From 47a39bc059996c9535ac35fed4d9832331e34b2d Mon Sep 17 00:00:00 2001
From: Vibhu Jawa <vibhujawa@gmail.com>
Date: Tue, 8 Oct 2024 20:56:42 -0700
Subject: [PATCH 5/6] One more chance Fix torch CI GPU issue

---
 ci/test_gpu.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/test_gpu.sh b/ci/test_gpu.sh
index 1b8f2da..9da821b 100755
--- a/ci/test_gpu.sh
+++ b/ci/test_gpu.sh
@@ -18,7 +18,7 @@ fi
 echo "Installing pytorch,transformers and pytest to the environment for crossfit tests..."
 mamba install \
   cuda-version=$CUDA_VERSION \
-  "pytorch>=2.0,<=*cuda*"
+  "pytorch>=2.*=*cuda*"
   transformers \
   pytest \
   sentence-transformers  \

From 1d6e6ca557155cc5a85535abf4a4f08193a064b8 Mon Sep 17 00:00:00 2001
From: Vibhu Jawa <vibhujawa@gmail.com>
Date: Tue, 8 Oct 2024 21:06:07 -0700
Subject: [PATCH 6/6] Fix typo

---
 ci/test_gpu.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/test_gpu.sh b/ci/test_gpu.sh
index 9da821b..6523110 100755
--- a/ci/test_gpu.sh
+++ b/ci/test_gpu.sh
@@ -18,7 +18,7 @@ fi
 echo "Installing pytorch,transformers and pytest to the environment for crossfit tests..."
 mamba install \
   cuda-version=$CUDA_VERSION \
-  "pytorch>=2.*=*cuda*"
+  "pytorch>=2.*=*cuda*" \
   transformers \
   pytest \
   sentence-transformers  \