solve conflicts

Author: jesus-villalba

egs/voxceleb/v1.1/datapath.sh

@@ -5,17 +5,18 @@
 
 
 if [ "$(hostname --domain)" == "clsp.jhu.edu" ];then
-    voxceleb1_root=/export/corpora5/VoxCeleb1_v1
-    voxceleb1_root=/export/corpora5/VoxCeleb1_v2
-    voxceleb2_root=/export/corpora5/VoxCeleb2
-    musan_root=/export/corpora5/JHU/musan
+  # voxceleb1_root=/export/corpora5/VoxCeleb1_v1 #voxceleb1 v1
+  voxceleb1_root=/export/corpora5/VoxCeleb1_v2 #voxceleb1 v2
+  voxceleb2_root=/export/corpora5/VoxCeleb2
+  musan_root=/export/corpora5/JHU/musan
 elif [ "$(hostname --domain)" == "cm.gemini" ];then
-    voxceleb1_root=/expscratch/dsnyder/VoxCeleb1
-    voxceleb2_root=/expscratch/dgromero/corpora-open/vox2
-    musan_root=/expscratch/dgromero/corpora-open/musan
+  # voxceleb1_root=/expscratch/dsnyder/VoxCeleb1 #voxceleb1 v1
+  voxceleb1_root=/exp/jvillalba/corpora/voxceleb1 #voxceleb1 v2
+  voxceleb2_root=/expscratch/dgromero/corpora-open/vox2
+  musan_root=/expscratch/dgromero/corpora-open/musan
 else
-    echo "Put your database paths here"
-    exit 1
+  echo "Put your database paths here"
+  exit 1
 fi
 
 

egs/voxceleb/v1/local/make_voxceleb1_v2_oeh.pl

@@ -34,7 +34,7 @@
 my $meta_path = "$data_base/vox1_meta.csv";
 if (! -e "$meta_path") {
     $meta_path = "$out_dir/vox1_meta.csv";
-    system("wget -O $meta_path $meta_url");
+    system("wget --no-check-certificate -O $meta_path $meta_url");
 }
 
 open(META_IN, "<", "$meta_path") or die "Could not open the meta data file $meta_path";

egs/voxceleb/v1/run_001_prepare_data.sh

@@ -15,14 +15,14 @@ config_file=default_config.sh
 
 
 if [ $stage -le 1 ];then
-
-    # Prepare the VoxCeleb2 dataset for training.
-    local/make_voxceleb2cat.pl $voxceleb2_root dev 16 data/voxceleb2cat_train
-    #local/make_voxceleb2cat.pl $voxceleb2_root test 16 data/voxceleb2cat_test
-    #utils/combine_data.sh data/voxceleb2cat data/voxceleb2cat_train data/voxceleb2cat_test 
+  # Prepare the VoxCeleb2 dataset for training.
+  local/make_voxceleb2cat.pl $voxceleb2_root dev 16 data/voxceleb2cat_train
 fi
 
 if [ $stage -le 2 ];then
-    # prepare voxceleb1 for test
-    local/make_voxceleb1_oeh.pl $voxceleb1_root data
+  # prepare voxceleb1 for test
+  # This script is for the old version of the dataset
+  # local/make_voxceleb1_oeh.pl $voxceleb1_root data
+  # Use this for the newer version of voxceleb1:
+  local/make_voxceleb1_v2_oeh.pl $voxceleb1_root data
 fi