From 2d4a764a83dc1de86d6b31a6adf32951520692b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicola=C3=AF=20Hoffmann?=
 <104215542+N-Hoffmann@users.noreply.github.com>
Date: Mon, 6 May 2024 12:49:39 +0200
Subject: [PATCH 1/4] Force mkl downgrade (#13)

* Force downgrade of mkl to 2024.0.0

Bug related to mkl prevents annexa from working using singularity, need to downgrade to older version of mkl and einops https://github.com/facebookresearch/esm/issues/677#issuecomment-2059603713

* Revert "Force downgrade of mkl to 2024.0.0"

This reverts commit c347cc5dab198aed429978e0c9215bf71b27e64e.

* Revert

* Force mkl downgrade to 2024.0.0
---
 environment.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/environment.yml b/environment.yml
index 8ad9d51..18fae2d 100755
--- a/environment.yml
+++ b/environment.yml
@@ -5,7 +5,7 @@ dependencies:
   - conda-forge::python=3.10.4
   - pytorch::pytorch=1.12.0
   - pytorch::cpuonly
-
+  
   - conda-forge::r-base=4.1
   - conda-forge::r-rcolorbrewer
   - conda-forge::r-tidyverse=1.3.2
@@ -16,7 +16,8 @@ dependencies:
   - conda-forge::r-viridis
 
   - conda-forge::procps-ng
-
+  - conda-forge::mkl==2024.0
+  
   - pip
   - pip:
       - git+https://github.com/igdrion/transforkmers.git

From 8163878f7362e06304b661b7c86e266a8498ca64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicola=C3=AF=20Hoffmann?=
 <104215542+N-Hoffmann@users.noreply.github.com>
Date: Mon, 6 May 2024 13:16:07 +0200
Subject: [PATCH 2/4] Force downgrade of mkl (#14)

* Force downgrade of mkl to 2024.0.0

Bug related to mkl prevents annexa from working using singularity, need to downgrade to older version of mkl and einops https://github.com/facebookresearch/esm/issues/677#issuecomment-2059603713

* Revert "Force downgrade of mkl to 2024.0.0"

This reverts commit c347cc5dab198aed429978e0c9215bf71b27e64e.

* Revert

* Force mkl downgrade to 2024.0.0

* Update environment.yml
---
 environment.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/environment.yml b/environment.yml
index 18fae2d..4250d83 100755
--- a/environment.yml
+++ b/environment.yml
@@ -3,9 +3,7 @@ dependencies:
   - conda-forge::git
 
   - conda-forge::python=3.10.4
-  - pytorch::pytorch=1.12.0
-  - pytorch::cpuonly
-  
+
   - conda-forge::r-base=4.1
   - conda-forge::r-rcolorbrewer
   - conda-forge::r-tidyverse=1.3.2
@@ -23,3 +21,5 @@ dependencies:
       - git+https://github.com/igdrion/transforkmers.git
       - transformers==4.27.2
       - tokenizers==0.13.2
+      - torch==1.12.0
+      - mkl==2024.0

From 4b0fde4b83a99ac30a914ef8f9f2765efb5093b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicola=C3=AF=20Hoffmann?=
 <104215542+N-Hoffmann@users.noreply.github.com>
Date: Mon, 6 May 2024 14:15:57 +0200
Subject: [PATCH 3/4] Force downgrade of mkl (#15)

* Force downgrade of mkl to 2024.0.0

Bug related to mkl prevents annexa from working using singularity, need to downgrade to older version of mkl and einops https://github.com/facebookresearch/esm/issues/677#issuecomment-2059603713

* Revert "Force downgrade of mkl to 2024.0.0"

This reverts commit c347cc5dab198aed429978e0c9215bf71b27e64e.

* Revert

* Force mkl downgrade to 2024.0.0

* Update environment.yml

* Update environment.yml

From 4415358d2e8b73cd13cdb3ae4e2a0de6dbd2cb17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicola=C3=AF=20Hoffmann?=
 <104215542+N-Hoffmann@users.noreply.github.com>
Date: Mon, 6 May 2024 14:34:20 +0200
Subject: [PATCH 4/4] Update environment.yml

---
 environment.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/environment.yml b/environment.yml
index 4250d83..18fae2d 100755
--- a/environment.yml
+++ b/environment.yml
@@ -3,7 +3,9 @@ dependencies:
   - conda-forge::git
 
   - conda-forge::python=3.10.4
-
+  - pytorch::pytorch=1.12.0
+  - pytorch::cpuonly
+  
   - conda-forge::r-base=4.1
   - conda-forge::r-rcolorbrewer
   - conda-forge::r-tidyverse=1.3.2
@@ -21,5 +23,3 @@ dependencies:
       - git+https://github.com/igdrion/transforkmers.git
       - transformers==4.27.2
       - tokenizers==0.13.2
-      - torch==1.12.0
-      - mkl==2024.0