fix conflict in ravdess pre-processing

bagustris · Oct 22, 2024 · 92fba84 · 92fba84
1 parent 3ceb852
commit 92fba84
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/data/ravdess/process_database.py b/data/ravdess/process_database.py
@@ -9,14 +9,9 @@
 
 adapted from https://www.kaggle.com/code/shivamburnwal/speech-emotion-recognition
 
-<<<<<<< HEAD
-Usage: `python3 process_database.py /data/ravdess_speech/`
-
-=======
 Usage: `python3 process_database.py -d /data/ravdess_speech
 OR
 `python3 process_database.py /data/ravdess_speech`
->>>>>>> e639b1104ec3f50b3944440119f2416aea6e31ac
 """
 
 
@@ -25,12 +20,6 @@
 
 import pandas as pd
 
-<<<<<<< HEAD
-
-# ravdess source directory as argument
-# source_dir = './'
-source_dir = sys.argv[1]
-=======
 import argparse
 from pathlib import Path, PurePath
 
@@ -40,7 +29,6 @@
 parser.add_argument('-d', '--dir', type=str, default='./', help='path to RAVDESS speech directory')
 args = parser.parse_args()
 source_dir = str(Path(args.dir))
->>>>>>> e639b1104ec3f50b3944440119f2416aea6e31ac
 database_name = 'ravdess'
 
 # check if directory (e.g., Actor_01) exists

diff --git a/nkululeko/test_pretrain.py b/nkululeko/test_pretrain.py
@@ -216,7 +216,6 @@ def compute_metrics(p: transformers.EvalPrediction):
     )
 
     class Trainer(transformers.Trainer):
-
         def compute_loss(
             self,
             model,
-Original file line number
+Diff line change
@@ Expand Up / @@ -216,7 +216,6 @@ def compute_metrics(p: transformers.EvalPrediction): @@
         )
         class Trainer(transformers.Trainer):
             def compute_loss(
                 self,
                 model,
@@ Expand Down @@