From f1e4664d56fff50a3698df7b0316f8ac22bfb150 Mon Sep 17 00:00:00 2001
From: Henk <henk@henk.tech>
Date: Fri, 11 Nov 2022 21:13:51 +0100
Subject: [PATCH] Dependency improvements

Adding psutil from conda to avoid the need for a compiler, finetuneanon should no longer be used. If people really want to use it they are on their own.
---
 environments/finetuneanon.yml  | 26 --------------------------
 environments/huggingface.yml   |  1 +
 environments/rocm-finetune.yml | 25 -------------------------
 environments/rocm.yml          |  1 +
 4 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100644 environments/finetuneanon.yml
 delete mode 100644 environments/rocm-finetune.yml

diff --git a/environments/finetuneanon.yml b/environments/finetuneanon.yml
deleted file mode 100644
index 85d5ea66..00000000
--- a/environments/finetuneanon.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: koboldai
-channels:
-  - pytorch
-  - conda-forge
-  - defaults
-dependencies:
-  - colorama
-  - flask-socketio
-  - flask-session
-  - pytorch
-  - cudatoolkit=11.1
-  - tensorflow-gpu
-  - python=3.8.*
-  - eventlet
-  - markdown
-  - bleach=4.1.0
-  - pip
-  - git=2.35.1
-  - marshmallow>=3.13
-  - apispec-webframeworks
-  - loguru
-  - pip:
-    - git+https://github.com/finetuneanon/transformers@gpt-neo-localattention3-rp-b
-    - flask-cloudflared
-    - flask-ngrok
-    - lupa==1.10
diff --git a/environments/huggingface.yml b/environments/huggingface.yml
index c1a168ae..886bdb1b 100644
--- a/environments/huggingface.yml
+++ b/environments/huggingface.yml
@@ -21,6 +21,7 @@ dependencies:
   - apispec-webframeworks
   - loguru
   - termcolor
+  - psutil
   - pip:
     - flask-cloudflared
     - flask-ngrok
diff --git a/environments/rocm-finetune.yml b/environments/rocm-finetune.yml
deleted file mode 100644
index fc56eb4f..00000000
--- a/environments/rocm-finetune.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: koboldai-ft
-channels:
-  - conda-forge
-  - defaults
-dependencies:
-  - colorama
-  - flask-socketio
-  - flask-session
-  - python=3.8.*
-  - eventlet
-  - markdown
-  - bleach=4.1.0
-  - pip
-  - git=2.35.1
-  - marshmallow>=3.13
-  - apispec-webframeworks
-  - loguru
-  - pip:
-    - --find-links https://download.pytorch.org/whl/rocm4.2/torch_stable.html
-    - torch
-    - torchvision==0.11.1
-    - flask-cloudflared
-    - git+https://github.com/finetuneanon/transformers@gpt-neo-localattention3-rp-b
-    - flask-ngrok
-    - lupa==1.10
diff --git a/environments/rocm.yml b/environments/rocm.yml
index 03425cf8..04bb88a6 100644
--- a/environments/rocm.yml
+++ b/environments/rocm.yml
@@ -18,6 +18,7 @@ dependencies:
   - apispec-webframeworks
   - loguru
   - termcolor
+  - psutil
   - pip:
     - --extra-index-url https://download.pytorch.org/whl/rocm5.1.1
     - torch