From 3b976c9af77439db7361a06a8c0901430400618e Mon Sep 17 00:00:00 2001
From: henk717 <henk717@msn.com>
Date: Sat, 27 Nov 2021 03:14:47 +0100
Subject: [PATCH] Updated defaults

Transformers official by default, no more Git versions
---
 environments/huggingface.yml |  5 ++---
 install_requirements.bat     | 12 ++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/environments/huggingface.yml b/environments/huggingface.yml
index a1159307..41031ba8 100644
--- a/environments/huggingface.yml
+++ b/environments/huggingface.yml
@@ -10,9 +10,8 @@ dependencies:
   - pytorch
   - python=3.8.*
   - cudatoolkit=11.1
-  - tensorflow-gpu
+  - transformers
   - pip
   - git
   - pip:
-    - flask-cloudflared
-    - git+https://github.com/vfbd/transformers#tfs
\ No newline at end of file
+    - flask-cloudflared
\ No newline at end of file
diff --git a/install_requirements.bat b/install_requirements.bat
index 47879159..01f2eac8 100644
--- a/install_requirements.bat
+++ b/install_requirements.bat
@@ -1,8 +1,8 @@
 @echo off
 title KoboldAI Runtime Installer (MicroMamba)
 echo Please choose one of the following transformers options
-echo 1. Finetuneanon Transformers (Best for GPU users)
-echo 2. Official Transformers (Best for CPU users)
+echo 1. Official Transformers (Recommended)
+echo 2. Finetune Transformers (For old 6B models)
 echo.
 echo Errors? Rerun this as admin so it can add the needed LongPathsEnabled registery tweak.
 echo Installer failed or crashed? Run it again so it can continue.
@@ -46,8 +46,8 @@ subst K: miniconda3
 copy umamba.exe K:\umamba.exe
 K:
 umamba.exe create -r K:\python\ -n base
-IF %B%==1 umamba.exe install --no-shortcuts -r K:\python\ -n base -f "%~dp0\environments\finetuneanon.yml" -y
-IF %B%==2 umamba.exe install --no-shortcuts -r K:\python\ -n base -f "%~dp0\environments\huggingface.yml" -y
+IF %B%==1 umamba.exe install --no-shortcuts -r K:\python\ -n base -f "%~dp0\environments\huggingface.yml" -y
+IF %B%==2 umamba.exe install --no-shortcuts -r K:\python\ -n base -f "%~dp0\environments\finetuneanon.yml" -y
 umamba.exe -r K:\ clean -a -y
 subst K: /d
 pause
@@ -56,8 +56,8 @@ exit
 :subfolder
 echo 2 > loader.settings
 umamba.exe create -r miniconda3\ -n base
-IF %B%==1 umamba.exe install --no-shortcuts -r miniconda3 -n base -f environments\finetuneanon.yml -y
-IF %B%==2 umamba.exe install --no-shortcuts -r miniconda3 -n base -f environments\huggingface.yml -y
+IF %B%==1 umamba.exe install --no-shortcuts -r miniconda3 -n base -f environments\huggingface.yml -y
+IF %B%==2 umamba.exe install --no-shortcuts -r miniconda3 -n base -f environments\finetuneanon.yml -y
 umamba.exe clean -a -y
 pause
 exit