Skip to content

Commit ab25805

Browse files
bjarthurbjarthur
committed
windows does not like commas in filenames
1 parent 99351d2 commit ab25805

File tree

4 files changed

+45
-47
lines changed

4 files changed

+45
-47
lines changed

‎src/gui/controller.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1729,7 +1729,7 @@ async def ensemble_actuate():
17291729
model = root
17301730
models.append(rkw)
17311731
ckpts.append(thisckpt)
1732-
model += '_'+','.join(models)
1732+
model += '_'+'_'.join(models)
17331733
os.makedirs(os.path.join(logdir, model), exist_ok=True)
17341734
shutil.copy(os.path.join(os.path.dirname(V_model_file_value.split(',')[0].rstrip(os.path.sep)),
17351735
"labels.txt"),
@@ -1745,7 +1745,7 @@ async def ensemble_actuate():
17451745
M.ensemble_cluster_flags,
17461746
"--start_checkpoints="+V_model_file_value, \
17471747
"--output_file="+os.path.join(logdir, model,
1748-
"frozen-graph.ckpt-"+','.join(ckpts)+".pb"), \
1748+
"frozen-graph.ckpt-"+'_'.join(ckpts)+".pb"), \
17491749
"--labels_touse="+','.join(labels),
17501750
"--context_ms="+V.context_ms.value,
17511751
"--model_architecture="+M.architecture_plugin,

‎src/gui/model.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def parse_model_file(modelstr):
2323
filepath, filename = os.path.split(filepath)
2424
logdir, modeldir = os.path.split(filepath)
2525
prefix = filename.split('.')[0]
26-
m=re.search('ckpt-([\d,]+)',filename)
26+
m=re.search('ckpt-([\d_]+)',filename)
2727
check_point = m.group(1)
2828
return logdir, modeldir, prefix, check_point
2929

‎test/tutorial.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -466,23 +466,23 @@
466466
wavpath_noext+"-disjoint-"+kind+"-only"+person+".csv"))
467467

468468
V.logs_folder.value = os.path.join(repo_path, "test", "scratch", "tutorial-py", "nfeaturesexclusive-64")
469-
V.model_file.value = os.path.join(V.logs_folder.value, "xvalidate_1k", "ckpt-300")+','+ \
470-
os.path.join(V.logs_folder.value, "xvalidate_2k", "ckpt-300")
469+
V.model_file.value = os.path.join(V.logs_folder.value, "xvalidate_1k", "ckpt-"+V.nsteps.value)+','+ \
470+
os.path.join(V.logs_folder.value, "xvalidate_2k", "ckpt-"+V.nsteps.value)
471471

472472
asyncio.run(C.ensemble_actuate())
473473

474474
wait_for_job(M.status_ticker_queue)
475475

476-
check_file_exists(os.path.join(V.logs_folder.value, "xvalidate_1k,2k", "ensemble.log"))
477-
check_file_exists(os.path.join(V.logs_folder.value, "xvalidate_1k,2k",
478-
"frozen-graph.ckpt-300,300.pb", "saved_model.pb"))
476+
check_file_exists(os.path.join(V.logs_folder.value, "xvalidate_1k_2k", "ensemble.log"))
477+
check_file_exists(os.path.join(V.logs_folder.value, "xvalidate_1k_2k",
478+
"frozen-graph.ckpt-"+V.nsteps.value+"_"+V.nsteps.value+".pb", "saved_model.pb"))
479479

480480
os.mkdir(os.path.join(repo_path, "test", "scratch", "tutorial-py", "groundtruth-data", "congruence-ensemble"))
481481
shutil.copy(os.path.join(repo_path, "data", "20190122T132554a-14.wav"),
482482
os.path.join(repo_path, "test", "scratch", "tutorial-py", "groundtruth-data", "congruence-ensemble"))
483483

484-
V.model_file.value = os.path.join(V.logs_folder.value, "xvalidate_1k,2k",
485-
"frozen-graph.ckpt-300,300.pb")
484+
V.model_file.value = os.path.join(V.logs_folder.value, "xvalidate_1k_2k",
485+
"frozen-graph.ckpt-"+V.nsteps.value+"_"+V.nsteps.value+".pb")
486486
V.wavcsv_files.value = os.path.join(repo_path,
487487
"test", "scratch", "tutorial-py", "groundtruth-data", "congruence-ensemble", "20190122T132554a-14.wav")
488488
asyncio.run(C.classify_actuate())
@@ -545,8 +545,8 @@
545545
check_file_exists(os.path.join(V.groundtruth_folder.value, "congruence-ensemble",
546546
wavpath_noext+"-disjoint-"+kind+"-only"+person+".csv"))
547547

548-
V.model_file.value = os.path.join(V.logs_folder.value, "xvalidate_1k,2k",
549-
"frozen-graph.ckpt-300,300.pb")
548+
V.model_file.value = os.path.join(V.logs_folder.value, "xvalidate_1k_2k",
549+
"frozen-graph.ckpt-"+V.nsteps.value+"_"+V.nsteps.value+".pb")
550550
V.wavcsv_files.value = os.path.join(repo_path,
551551
"test", "scratch", "tutorial-py", "groundtruth-data", "round1", "PS_20130625111709_ch3.wav")
552552
asyncio.run(C.classify_actuate())
@@ -562,9 +562,9 @@
562562
thresholds_dense_file=next(filter(lambda x: x.startswith('thresholds-dense'),
563563
os.listdir(frompath)))
564564
shutil.move(os.path.join(frompath, thresholds_dense_file),
565-
os.path.join(V.logs_folder.value, "xvalidate_1k,2k"))
565+
os.path.join(V.logs_folder.value, "xvalidate_1k_2k"))
566566

567-
V.model_file.value = os.path.join(V.logs_folder.value, "xvalidate_1k,2k", thresholds_dense_file)
567+
V.model_file.value = os.path.join(V.logs_folder.value, "xvalidate_1k_2k", thresholds_dense_file)
568568
asyncio.run(C.ethogram_actuate())
569569

570570
wait_for_job(M.status_ticker_queue)

‎test/tutorial.sh‎

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,13 @@ check_file_exists $logdir/P-R-F1-label.pdf
152152
check_file_exists $logdir/P-R-F1-model.pdf
153153
check_file_exists $logdir/PvR.pdf
154154

155-
check_point=$nsteps
156155
cmd="${srcdir}/freeze \
157156
--context_ms=$context_ms \
158157
--loss=$loss \
159158
--model_architecture=$architecture \
160159
--model_parameters='$model_parameters' \
161-
--start_checkpoint=${logdir}/train_${ireplicates}r/ckpt-$check_point \
162-
--output_file=${logdir}/train_${ireplicates}r/frozen-graph.ckpt-${check_point}.pb \
160+
--start_checkpoint=${logdir}/train_${ireplicates}r/ckpt-$nsteps \
161+
--output_file=${logdir}/train_${ireplicates}r/frozen-graph.ckpt-${nsteps}.pb \
163162
--labels_touse=$labels_touse \
164163
--parallelize=$classify_parallelize \
165164
--audio_tic_rate=$audio_tic_rate \
@@ -169,11 +168,11 @@ cmd="${srcdir}/freeze \
169168
--video_frame_width=$video_frame_width \
170169
--video_channels=$video_channels \
171170
--igpu="
172-
echo $cmd >> $logdir/train_${ireplicates}r/freeze.ckpt-${check_point}.log 2>&1
173-
eval $cmd >> $logdir/train_${ireplicates}r/freeze.ckpt-${check_point}.log 2>&1
171+
echo $cmd >> $logdir/train_${ireplicates}r/freeze.ckpt-${nsteps}.log 2>&1
172+
eval $cmd >> $logdir/train_${ireplicates}r/freeze.ckpt-${nsteps}.log 2>&1
174173

175-
check_file_exists $logdir/train_${ireplicates}r/freeze.ckpt-${check_point}.log
176-
check_file_exists $logdir/train_${ireplicates}r/frozen-graph.ckpt-${check_point}.pb
174+
check_file_exists $logdir/train_${ireplicates}r/freeze.ckpt-${nsteps}.log
175+
check_file_exists $logdir/train_${ireplicates}r/frozen-graph.ckpt-${nsteps}.pb
177176

178177
mkdir $repo_path/test/scratch/tutorial-sh/groundtruth-data/round2
179178
cp $repo_path/data/20161207T102314_ch1.wav \
@@ -190,7 +189,7 @@ cmd="${srcdir}/classify \
190189
--video_read_plugin_kwargs=$video_read_plugin_kwargs \
191190
--video_findfile_plugin=$video_findfile_plugin \
192191
--video_bkg_frames=$video_bkg_frames \
193-
--model=$logdir/train_${ireplicates}r/frozen-graph.ckpt-${check_point}.pb \
192+
--model=$logdir/train_${ireplicates}r/frozen-graph.ckpt-${nsteps}.pb \
194193
--model_labels=$logdir/train_${ireplicates}r/labels.txt \
195194
--wav=${wavpath_noext}.wav \
196195
--parallelize=$classify_parallelize \
@@ -214,7 +213,7 @@ for label in $(echo $labels_touse | sed "s/,/ /g") ; do
214213
done
215214

216215
cmd="${srcdir}/ethogram \
217-
$logdir train_${ireplicates}r thresholds.ckpt-${check_point}.csv \
216+
$logdir train_${ireplicates}r thresholds.ckpt-${nsteps}.csv \
218217
${wavpath_noext}.wav $audio_tic_rate"
219218
echo $cmd >> ${wavpath_noext}-ethogram.log 2>&1
220219
eval $cmd >> ${wavpath_noext}-ethogram.log 2>&1
@@ -252,7 +251,6 @@ check_file_exists ${wavpath_noext}-missed.csv
252251
count_lines_with_label ${wavpath_noext}-missed.csv other 1569 WARNING
253252

254253
model=train_${ireplicates}r
255-
check_point=$nsteps
256254
kinds_touse=annotated,missed
257255
equalize_ratio=1000
258256
max_sounds=10000
@@ -267,7 +265,7 @@ cmd="${srcdir}/activations \
267265
--data_loader_maxprocs=$data_loader_maxprocs \
268266
--model_architecture=$architecture \
269267
--model_parameters='$model_parameters' \
270-
--start_checkpoint=$logdir/$model/ckpt-$check_point \
268+
--start_checkpoint=$logdir/$model/ckpt-$nsteps \
271269
--data_dir=$data_dir \
272270
--labels_touse=$labels_touse \
273271
--kinds_touse=$kinds_touse \
@@ -589,8 +587,8 @@ cmd="${srcdir}/freeze \
589587
--loss=$loss \
590588
--model_architecture=$architecture \
591589
--model_parameters='$model_parameters' \
592-
--start_checkpoint=${logdir}/train_${ireplicates}r/ckpt-$check_point \
593-
--output_file=${logdir}/train_${ireplicates}r/frozen-graph.ckpt-${check_point}.pb \
590+
--start_checkpoint=${logdir}/train_${ireplicates}r/ckpt-$nsteps \
591+
--output_file=${logdir}/train_${ireplicates}r/frozen-graph.ckpt-${nsteps}.pb \
594592
--labels_touse=$labels_touse \
595593
--parallelize=$classify_parallelize \
596594
--audio_tic_rate=$audio_tic_rate \
@@ -600,11 +598,11 @@ cmd="${srcdir}/freeze \
600598
--video_frame_width=$video_frame_width \
601599
--video_channels=$video_channels \
602600
--igpu="
603-
echo $cmd >> $logdir/train_${ireplicates}r/freeze.ckpt-${check_point}.log 2>&1
604-
eval $cmd >> $logdir/train_${ireplicates}r/freeze.ckpt-${check_point}.log 2>&1
601+
echo $cmd >> $logdir/train_${ireplicates}r/freeze.ckpt-${nsteps}.log 2>&1
602+
eval $cmd >> $logdir/train_${ireplicates}r/freeze.ckpt-${nsteps}.log 2>&1
605603

606-
check_file_exists $logdir/train_${ireplicates}r/freeze.ckpt-${check_point}.log
607-
check_file_exists $logdir/train_${ireplicates}r/frozen-graph.ckpt-${check_point}.pb
604+
check_file_exists $logdir/train_${ireplicates}r/freeze.ckpt-${nsteps}.log
605+
check_file_exists $logdir/train_${ireplicates}r/frozen-graph.ckpt-${nsteps}.pb
608606

609607
mkdir $repo_path/test/scratch/tutorial-sh/groundtruth-data/congruence
610608
cp $repo_path/data/20190122T093303a-7.wav \
@@ -621,7 +619,7 @@ cmd="${srcdir}/classify \
621619
--video_read_plugin_kwargs=$video_read_plugin_kwargs \
622620
--video_findfile_plugin=$video_findfile_plugin \
623621
--video_bkg_frames=$video_bkg_frames \
624-
--model=$logdir/train_${ireplicates}r/frozen-graph.ckpt-${check_point}.pb \
622+
--model=$logdir/train_${ireplicates}r/frozen-graph.ckpt-${nsteps}.pb \
625623
--model_labels=$logdir/train_${ireplicates}r/labels.txt \
626624
--wav=${wavpath_noext}.wav \
627625
--parallelize=$classify_parallelize \
@@ -645,7 +643,7 @@ for label in $(echo $labels_touse | sed "s/,/ /g") ; do
645643
done
646644

647645
cmd="${srcdir}/ethogram \
648-
$logdir train_${ireplicates}r thresholds.ckpt-${check_point}.csv \
646+
$logdir train_${ireplicates}r thresholds.ckpt-${nsteps}.csv \
649647
${wavpath_noext}.wav $audio_tic_rate"
650648
echo $cmd >> ${wavpath_noext}-ethogram.log 2>&1
651649
eval $cmd >> ${wavpath_noext}-ethogram.log 2>&1
@@ -709,22 +707,22 @@ done
709707

710708
logdir=${repo_path}/test/scratch/tutorial-sh/nfeaturesexclusive-64
711709

712-
mkdir ${logdir}/xvalidate_1k,2k
710+
mkdir ${logdir}/xvalidate_1k_2k
713711
cmd="${srcdir}/ensemble \
714-
--start_checkpoints=${logdir}/xvalidate_1k/ckpt-300,${logdir}/xvalidate_2k/ckpt-300 \
715-
--output_file=${logdir}/xvalidate_1k,2k/frozen-graph.ckpt-300,300.pb \
712+
--start_checkpoints=${logdir}/xvalidate_1k/ckpt-${nsteps},${logdir}/xvalidate_2k/ckpt-${nsteps} \
713+
--output_file=${logdir}/xvalidate_1k_2k/frozen-graph.ckpt-${nsteps}_${nsteps}.pb \
716714
--labels_touse=mel-pulse,mel-sine,ambient \
717715
--context_ms=$context_ms \
718716
--model_architecture=$architecture \
719717
--model_parameters='$model_parameters' \
720718
--parallelize=$classify_parallelize \
721719
--audio_tic_rate=$audio_tic_rate \
722720
--nchannels=$audio_nchannels"
723-
echo $cmd >> ${logdir}/xvalidate_1k,2k/ensemble.log 2>&1
724-
eval $cmd >> ${logdir}/xvalidate_1k,2k/ensemble.log 2>&1
721+
echo $cmd >> ${logdir}/xvalidate_1k_2k/ensemble.log 2>&1
722+
eval $cmd >> ${logdir}/xvalidate_1k_2k/ensemble.log 2>&1
725723

726-
check_file_exists ${logdir}/xvalidate_1k,2k/ensemble.log
727-
check_file_exists ${logdir}/xvalidate_1k,2k/frozen-graph.ckpt-${check_point},${check_point}.pb/saved_model.pb
724+
check_file_exists ${logdir}/xvalidate_1k_2k/ensemble.log
725+
check_file_exists ${logdir}/xvalidate_1k_2k/frozen-graph.ckpt-${nsteps}_${nsteps}.pb/saved_model.pb
728726

729727
mkdir -p $repo_path/test/scratch/tutorial-sh/groundtruth-data/congruence-ensemble
730728
cp $repo_path/data/20190122T132554a-14.wav \
@@ -741,8 +739,8 @@ cmd="${srcdir}/classify \
741739
--video_read_plugin_kwargs=$video_read_plugin_kwargs \
742740
--video_findfile_plugin=$video_findfile_plugin \
743741
--video_bkg_frames=$video_bkg_frames \
744-
--model=${logdir}/xvalidate_1k,2k/frozen-graph.ckpt-${check_point},${check_point}.pb \
745-
--model_labels=${logdir}/xvalidate_1k,2k/labels.txt \
742+
--model=${logdir}/xvalidate_1k_2k/frozen-graph.ckpt-${nsteps}_${nsteps}.pb \
743+
--model_labels=${logdir}/xvalidate_1k_2k/labels.txt \
746744
--wav=${wavpath_noext}.wav \
747745
--parallelize=$classify_parallelize \
748746
--audio_tic_rate=$audio_tic_rate \
@@ -765,7 +763,7 @@ for label in $(echo $labels_touse | sed "s/,/ /g") ; do
765763
done
766764

767765
cmd="${srcdir}/ethogram \
768-
$logdir xvalidate_1k thresholds.ckpt-${check_point}.csv \
766+
$logdir xvalidate_1k thresholds.ckpt-${nsteps}.csv \
769767
${wavpath_noext}.wav $audio_tic_rate"
770768
echo $cmd >> ${wavpath_noext}-ethogram.log 2>&1
771769
eval $cmd >> ${wavpath_noext}-ethogram.log 2>&1
@@ -833,8 +831,8 @@ cmd="${srcdir}/classify \
833831
--video_read_plugin_kwargs=$video_read_plugin_kwargs \
834832
--video_findfile_plugin=$video_findfile_plugin \
835833
--video_bkg_frames=$video_bkg_frames \
836-
--model=${logdir}/xvalidate_1k,2k/frozen-graph.ckpt-${check_point},${check_point}.pb \
837-
--model_labels=${logdir}/xvalidate_1k,2k/labels.txt \
834+
--model=${logdir}/xvalidate_1k_2k/frozen-graph.ckpt-${nsteps}_${nsteps}.pb \
835+
--model_labels=${logdir}/xvalidate_1k_2k/labels.txt \
838836
--wav=${wavpath_noext}.wav \
839837
--parallelize=$classify_parallelize \
840838
--audio_tic_rate=$audio_tic_rate \
@@ -857,10 +855,10 @@ for label in $(echo $labels_touse | sed "s/,/ /g") ; do
857855
done
858856

859857
thresholds_dense_file=$(basename $(ls ${logdir}/xvalidate_1k/thresholds-dense-*))
860-
mv ${logdir}/xvalidate_1k/${thresholds_dense_file} ${logdir}/xvalidate_1k,2k
858+
mv ${logdir}/xvalidate_1k/${thresholds_dense_file} ${logdir}/xvalidate_1k_2k
861859

862860
cmd="${srcdir}/ethogram \
863-
$logdir xvalidate_1k,2k ${thresholds_dense_file} \
861+
$logdir xvalidate_1k_2k ${thresholds_dense_file} \
864862
${wavpath_noext}.wav $audio_tic_rate"
865863
echo $cmd >> ${wavpath_noext}-ethogram.log 2>&1
866864
eval $cmd >> ${wavpath_noext}-ethogram.log 2>&1

0 commit comments

Comments
 (0)