Skip to content

Commit

Permalink
config update
Browse files Browse the repository at this point in the history
  • Loading branch information
dapowan committed Jan 13, 2022
1 parent b992908 commit 9bf0da7
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 24 deletions.
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/dataset/uci/
/dataset/motion/
/dataset/hhar/
/dataset/shoaib/
#/dataset/uci/
#/dataset/motion/
#/dataset/hhar/
#/dataset/shoaib/
/log/
/embed/
/saved/
8 changes: 4 additions & 4 deletions config.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@ def create_io_config(args, dataset_name, version, pretrain_model=None, target='p
os.mkdir(save_path)
args.save_path = os.path.join(save_path, args.save_model)

log_path = os.path.join('log', target + "_" + dataset_name + "_" + version) # + "_temp"
if not os.path.exists(log_path):
os.mkdir(log_path)
args.log_dir = log_path
# log_path = os.path.join('log', target + "_" + dataset_name + "_" + version) # + "_temp"
# if not os.path.exists(log_path):
# os.mkdir(log_path)
# args.log_dir = log_path

if pretrain_model is not None:
if target.count('_') > 2: # bert_classifier
Expand Down
8 changes: 4 additions & 4 deletions pretrain.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
nohup python -u pretrain.py v1 motion 20_120 -g 0 -s v1 > log/pretrain_base_motion.log &
nohup python -u pretrain.py v1 uci 20_120 -g 0 -s v1 > log/pretrain_base_uci.log &
nohup python -u pretrain.py v1 hhar 20_120 -g 0 -s v1 > log/pretrain_base_hhar.log &
nohup python -u pretrain.py v1 shoaib 20_120 -g 0 -s v1 > log/pretrain_base_shoaib.log &
nohup python -u pretrain.py v1 motion 20_120 -g 0 -s motion > log/pretrain_base_motion.log &
nohup python -u pretrain.py v1 uci 20_120 -g 0 -s uci > log/pretrain_base_uci.log &
nohup python -u pretrain.py v1 hhar 20_120 -g 0 -s hhar > log/pretrain_base_hhar.log &
nohup python -u pretrain.py v1 shoaib 20_120 -g 0 -s shoaib > log/pretrain_base_shoaib.log &
25 changes: 13 additions & 12 deletions utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -403,21 +403,22 @@ def handle_argv(target, config_train, prefix):
help='The saved model name')
try:
args = parser.parse_args()
model_cfg = load_model_config(target, prefix, args.model_version)
if model_cfg is None:
print("Unable to find corresponding model config!")
sys.exit()
args.model_cfg = model_cfg
dataset_cfg = load_dataset_stats(args.dataset, args.dataset_version)
if dataset_cfg is None:
print("Unable to find corresponding dataset config!")
sys.exit()
args.dataset_cfg = dataset_cfg
args = create_io_config(args, args.dataset, args.dataset_version, pretrain_model=args.model_file, target=target)
return args
except:
parser.print_help()
sys.exit(0)
model_cfg = load_model_config(target, prefix, args.model_version)
if model_cfg is None:
print("Unable to find corresponding model config!")
sys.exit()
args.model_cfg = model_cfg
dataset_cfg = load_dataset_stats(args.dataset, args.dataset_version)
if dataset_cfg is None:
print("Unable to find corresponding dataset config!")
sys.exit()
args.dataset_cfg = dataset_cfg
args = create_io_config(args, args.dataset, args.dataset_version, pretrain_model=args.model_file, target=target)
return args



def handle_argv_simple():
Expand Down

0 comments on commit 9bf0da7

Please sign in to comment.