From bd05c8ec47ba623f29fe10cf922e68ec280311d3 Mon Sep 17 00:00:00 2001
From: Himadri Bhattacharjee <lavafroth@protonmail.com>
Date: Thu, 27 Jul 2023 10:01:45 +0530
Subject: [PATCH 1/2] added environment.yml to define conda environment

---
 README.md       | 4 ++--
 environment.yml | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 environment.yml

diff --git a/README.md b/README.md
index e285b792e..5797d1af7 100644
--- a/README.md
+++ b/README.md
@@ -15,10 +15,10 @@ Just run it in the terminal.
 Check latest cudnn and cudatoolkit version for your GPU device.
 
 ```bash
- conda create -n deepfacelab -c main python=3.7 cudnn=7.6.5 cudatoolkit=10.1.243
- conda activate deepfacelab
  git clone --depth 1 https://github.com/nagadit/DeepFaceLab_Linux.git
  cd DeepFaceLab_Linux
+ conda env create -f environment.yml
+ conda activate deepfacelab
  git clone --depth 1 https://github.com/iperov/DeepFaceLab.git
  python -m pip install -r ./DeepFaceLab/requirements-cuda.txt
 ```
diff --git a/environment.yml b/environment.yml
new file mode 100644
index 000000000..61658b5c6
--- /dev/null
+++ b/environment.yml
@@ -0,0 +1,5 @@
+name: deepfacelab
+dependencies:
+  - python=3.7
+  - cudnn=7.6.5
+  - cudatoolkit=10.1.243

From 076034efc7c6af0f70bf33ed42594495934dae45 Mon Sep 17 00:00:00 2001
From: Himadri Bhattacharjee <lavafroth@protonmail.com>
Date: Thu, 27 Jul 2023 10:05:19 +0530
Subject: [PATCH 2/2] move environment variables from script to yaml file

---
 environment.yml | 5 +++++
 scripts/env.sh  | 8 +-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/environment.yml b/environment.yml
index 61658b5c6..f3c8e60e5 100644
--- a/environment.yml
+++ b/environment.yml
@@ -3,3 +3,8 @@ dependencies:
   - python=3.7
   - cudnn=7.6.5
   - cudatoolkit=10.1.243
+variables:
+  DFL_PYTHON: python3.7
+  DFL_WORKSPACE: "workspace/"
+  DFL_ROOT: "./"
+  DFL_SRC: "./DeepFaceLab"
\ No newline at end of file
diff --git a/scripts/env.sh b/scripts/env.sh
index 152f583c2..648bda383 100644
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 conda activate deepfacelab
-cd ..
-export DFL_PYTHON="python3.7"
-export DFL_WORKSPACE="workspace/"
 
 if [ ! -d "$DFL_WORKSPACE" ]; then
     mkdir "$DFL_WORKSPACE"
@@ -13,7 +10,4 @@ if [ ! -d "$DFL_WORKSPACE" ]; then
     mkdir "$DFL_WORKSPACE/data_dst/aligned"
     mkdir "$DFL_WORKSPACE/data_dst/aligned_debug"
     mkdir "$DFL_WORKSPACE/model"
-fi
-
-export DFL_ROOT="./"
-export DFL_SRC="./DeepFaceLab"
\ No newline at end of file
+fi
\ No newline at end of file