From 9ef1e07351835783f0b24ed39ba89377f0938597 Mon Sep 17 00:00:00 2001
From: D-X-Y <280835372@qq.com>
Date: Sun, 5 Apr 2020 06:18:52 +0000
Subject: [PATCH] Update X scripts

---
 configs/nas-benchmark/hyper-opts/01E.config | 13 +++++++
 exps/NAS-Bench-201/xshapes.py               |  2 +-
 scripts-search/X-X/train-shapes-v2.sh       | 40 +++++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 configs/nas-benchmark/hyper-opts/01E.config
 create mode 100644 scripts-search/X-X/train-shapes-v2.sh

diff --git a/configs/nas-benchmark/hyper-opts/01E.config b/configs/nas-benchmark/hyper-opts/01E.config
new file mode 100644
index 0000000..24a7fcd
--- /dev/null
+++ b/configs/nas-benchmark/hyper-opts/01E.config
@@ -0,0 +1,13 @@
+{
+  "scheduler": ["str",   "cos"],
+  "eta_min"  : ["float", "0.0"],
+  "epochs"   : ["int",   "1"],
+  "warmup"   : ["int",   "0"],
+  "optim"    : ["str",   "SGD"],
+  "LR"       : ["float", "0.1"],
+  "decay"    : ["float", "0.0005"],
+  "momentum" : ["float", "0.9"],
+  "nesterov" : ["bool",  "1"],
+  "criterion": ["str",   "Softmax"],
+  "batch_size": ["int", "256"]
+}
diff --git a/exps/NAS-Bench-201/xshapes.py b/exps/NAS-Bench-201/xshapes.py
index c74a7d5..a1de95b 100644
--- a/exps/NAS-Bench-201/xshapes.py
+++ b/exps/NAS-Bench-201/xshapes.py
@@ -201,7 +201,7 @@ if __name__ == '__main__':
   parser.add_argument('--datasets',    type=str, nargs='+',      help='The applied datasets.')
   parser.add_argument('--xpaths',      type=str, nargs='+',      help='The root path for this dataset.')
   parser.add_argument('--splits',      type=int, nargs='+',      help='The root path for this dataset.')
-  parser.add_argument('--hyper',       type=str, default='12', choices=['12', '90'], help='The tag for hyper-parameters.')
+  parser.add_argument('--hyper',       type=str, default='12', choices=['01', '12', '90'], help='The tag for hyper-parameters.')
   parser.add_argument('--seeds'  ,     type=int, nargs='+',      help='The range of models to be evaluated')
   args = parser.parse_args()
 
diff --git a/scripts-search/X-X/train-shapes-v2.sh b/scripts-search/X-X/train-shapes-v2.sh
new file mode 100644
index 0000000..25aa72a
--- /dev/null
+++ b/scripts-search/X-X/train-shapes-v2.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+#####################################################
+# Copyright (c) Xuanyi Dong [GitHub D-X-Y], 2020.01 #
+#####################################################
+# SLURM_PROCID=0 SLURM_NTASKS=6 bash ./scripts-search/X-X/train-shapes-v2.sh 12 777
+#
+# SLURM_PROCID=0 SLURM_NTASKS=2 bash ./scripts-search/X-X/train-shapes.sh 31000-32767 90 777
+echo script name: $0
+echo $# arguments
+if [ "$#" -ne 2 ] ;then
+  echo "Input illegal number of parameters " $#
+  echo "Need 2 parameters for hyper-parameters-opt-file, and seeds"
+  exit 1
+fi
+if [ "$TORCH_HOME" = "" ]; then
+  echo "Must set TORCH_HOME envoriment variable for data dir saving"
+  exit 1
+else
+  echo "TORCH_HOME : $TORCH_HOME"
+fi
+
+#srange=01000-03999,04050-05000,06000-09000,11000-14500,15000-18500,20000-23500,25000-27500,29000-30000
+#srange=00000-00999,04000-04049,05001-05999,09001-10999,14501-14999,18501-19999,23501-24999,27501-28999,30001-32767
+srange=00000-00999,04000-04049,05001-05999,09001-10999,14501-14999,18501-19999,23501-24999,27501-28999,30001-30999
+opt=$1
+all_seeds=$2
+cpus=4
+
+save_dir=./output/NAS-BENCH-202/
+
+OMP_NUM_THREADS=${cpus} python exps/NAS-Bench-201/xshapes.py \
+	--mode new --srange ${srange} --hyper ${opt} --save_dir ${save_dir} \
+	--datasets cifar10 cifar10 cifar100 ImageNet16-120 \
+	--splits   1       0       0        0 \
+	--xpaths $TORCH_HOME/cifar.python \
+		 $TORCH_HOME/cifar.python \
+		 $TORCH_HOME/cifar.python \
+		 $TORCH_HOME/cifar.python/ImageNet16 \
+	--workers ${cpus} \
+	--seeds ${all_seeds}