Merge branch 'master' of github.com:weecology/DeepTreeAttention

wubingting · Feb 12, 2021 · 75810dc · 75810dc
2 parents 5a3b49f + 1d2e4b2
commit 75810dc
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 57 deletions.
diff --git a/data/processed/species_class_labels.csv b/data/processed/species_class_labels.csv
@@ -1,56 +1,58 @@
 ,taxonID,label
-0,ABLAL,0
-1,ABLO,1
-2,ACNEN,2
-3,ACRU,3
-4,ACSA3,4
-5,ALRU2,5
-6,BELE,6
-7,BENE4,7
-8,BEPAP,8
-9,BUSI,9
-10,CADE27,10
-11,CAOV2,11
-12,CATO6,12
-13,CECA4,13
-14,CELA,14
-15,CEOC,15
-16,FAGR,16
-17,FRAM2,17
-18,FRPE,18
-19,JUNI,19
-20,JUVI,20
-21,LIST2,21
-22,LITU,22
-23,MAPO,23
-24,PIAL3,24
-25,PICO,25
-26,PICOL,26
-27,PIEC2,27
-28,PIEN,28
-29,PIFL2,29
-30,PIGL,30
-31,PIMA,31
-32,PIPA2,32
-33,PIPOS,33
-34,PIRU,34
-35,PIST,35
-36,PITA,36
-37,PLOC,37
-38,POGR4,38
-39,POTR5,39
-40,PSME,40
-41,PSMEM,41
-42,QUAL,42
-43,QUDO,43
-44,QULA2,44
-45,QUMA3,45
-46,QUMO4,46
-47,QUMU,47
-48,QURU,48
-49,QUVE,49
-50,SASSA,50
-51,TIAM,51
-52,TSCA,52
-53,TSHE,53
-54,ULAM,54
+0,ABAM,0
+1,ABLAL,1
+2,ABLO,2
+3,ABMA,3
+4,ACRU,4
+5,ACSA3,5
+6,BEAL2,6
+7,BELE,7
+8,BENE4,8
+9,BEPA,9
+10,BEPAP,10
+11,BUBU,11
+12,BUSI,12
+13,CACA18,13
+14,CADE27,14
+15,CAGL8,15
+16,CAOV2,16
+17,CATO6,17
+18,CELA,18
+19,FRAM2,19
+20,FRNI,20
+21,FRPE,21
+22,GUOF,22
+23,JUNI,23
+24,JUVI,24
+25,LARIX,25
+26,LELE10,26
+27,LIST2,27
+28,LITU,28
+29,NYSY,29
+30,OXYDE,30
+31,PIAL3,31
+32,PICO,32
+33,PICOL,33
+34,PIEC2,34
+35,PIEN,35
+36,PIFL2,36
+37,PIGL,37
+38,PIMA,38
+39,PIPA2,39
+40,PIPOS,40
+41,PITA,41
+42,POTR5,42
+43,PSME,43
+44,PSMEM,44
+45,QUAL,45
+46,QUCO2,46
+47,QUDO,47
+48,QUGE2,48
+49,QUMA3,49
+50,QUMO4,50
+51,QURU,51
+52,QUST,52
+53,QUVE,53
+54,SWMA2,54
+55,TSCA,55
+56,TSHE,56
diff --git a/data/processed/test.dbf b/data/processed/test.dbf
diff --git a/data/processed/test.shp b/data/processed/test.shp
diff --git a/data/processed/test.shx b/data/processed/test.shx
diff --git a/data/processed/train.dbf b/data/processed/train.dbf
diff --git a/data/processed/train.shp b/data/processed/train.shp
diff --git a/data/processed/train.shx b/data/processed/train.shx
diff --git a/experiments/Trees/generate.py b/experiments/Trees/generate.py
@@ -82,7 +82,7 @@ def run(record, savedir, raw_box_dir):
         elevation=elevation,
         label_column="taxonID",
         species_label_dict=species_label_dict,
-        ensemble_model=ensemble_model,
+        ensemble_model=None,
         savedir=savedir
     )
 

diff --git a/experiments/Trees/submit_experiment.sbatch b/experiments/Trees/submit_experiment.sbatch
@@ -3,7 +3,7 @@
 #SBATCH --mail-type=END               # Mail events
 #SBATCH --mail-user=benweinstein2010@gmail.com  # Where to send mail
 #SBATCH --account=ewhite
-#SBATCH --cpus-per-task=30
+#SBATCH --cpus-per-task=10
 #SBATCH --mem=40GB
 #SBATCH --time=24:00:00       #Time limit hrs:min:sec
 #SBATCH --output=/home/b.weinstein/logs/DeepTreeAttention_%j.out   # Standard output and error log