Added Hydra support as an option in ArgParse UI (#302)

* Introducing Hydra in Code-generator * Made some bug fixes and CI changes * Add changes to colab functions for Hydra * fix bug in colab.js * fix bugs in utils.py * Removed unnecessay code in setup_config for hydra * changed colab function behaviour when argparser = hydra * fixed colab output * changed the argparser due to undefined output * final change, removing debug output * Fix bugs for Hydra output-dir and overiding the config files

Author: guptaaryan16

.github/workflows/ci.yml

@@ -84,13 +84,17 @@ jobs:
  - run: sh ./scripts/run_tests.sh unzip
  - run: pnpm dist_lint ${{ matrix.template }} argparse
  - run: pnpm dist_lint ${{ matrix.template }} fire
+ - run: pnpm dist_lint ${{ matrix.template }} hydra
 
  - name: 'Run ${{ matrix.template }} ${{ matrix.test }}'
  run: sh ./scripts/run_tests.sh ${{ matrix.test }} ${{ matrix.template }} argparse
 
  - name: 'Run ${{ matrix.template }} ${{ matrix.test }} - Python Fire'
  run: sh ./scripts/run_tests.sh ${{ matrix.test }} ${{ matrix.template }} fire
 
+ - name: 'Run ${{ matrix.template }} ${{ matrix.test }} - Hydra'
+ run: sh ./scripts/run_tests.sh ${{ matrix.test }} ${{ matrix.template }} hydra
+
  lint:
  runs-on: ubuntu-latest
  steps:

__tests__/text-classification.spec.js

@@ -24,7 +24,7 @@ afterEach(async () => {
  await context.close()
 })
 
-const parser = ['argparse', 'fire']
+const parser = ['argparse', 'fire', 'hydra']
 for (const name of parser) {
  test(`text-classification simple ${name}`, async () => {
  await page.selectOption('select', 'template-text-classification')

__tests__/vision-classification.spec.js

@@ -24,7 +24,7 @@ afterEach(async () => {
  await context.close()
 })
 
-const parser = ['argparse', 'fire']
+const parser = ['argparse', 'fire', 'hydra']
 for (const name of parser) {
  test(`vision-classification simple ${name}`, async () => {
  await page.selectOption('select', 'template-vision-classification')

__tests__/vision-dcgan.spec.js

@@ -24,7 +24,7 @@ afterEach(async () => {
  await context.close()
 })
 
-const parser = ['argparse', 'fire']
+const parser = ['argparse', 'fire', 'hydra']
 for (const name of parser) {
  test(`vision-dcgan simple ${name}`, async () => {
  await page.selectOption('select', 'template-vision-dcgan')

__tests__/vision-segmentation.spec.js

@@ -24,7 +24,7 @@ afterEach(async () => {
  await context.close()
 })
 
-const parser = ['argparse', 'fire']
+const parser = ['argparse', 'fire', 'hydra']
 for (const name of parser) {
  test(`vision-segmentation simple ${name}`, async () => {
  await page.selectOption('select', 'template-vision-segmentation')

functions/colab.js

@@ -48,7 +48,14 @@ exports.handler = async function (event, _) {
  '!pip install -r requirements.txt'
  ]
 
- const execution_nb_commands = ['!python main.py config.yaml']
+ const argparser = data.argparser
+ const execution_nb_commands = [
+ `!python main.py ${
+ argparser === 'hydra'
+ ? '#--config-dir=/content/ --config-name=config.yaml'
+ : 'config.yaml'
+ }`
+ ]
 
  let nb_cells = [
  create_nb_cell(md_cell, 'markdown'),

scripts/requirements.txt

@@ -9,4 +9,5 @@ transformers
 datasets
 tensorboard
 fire 
+hydra-core
 omegaconf

scripts/run_code_style.sh

@@ -17,6 +17,11 @@ if [ $1 == "dist_lint" ]; then
  ls ./dist-tests/$TEMP-all-fire/main.py
  fi
 
+ # for hydra
+ if [ "$ARGPARSE" == "hydra" ]; then 
+ ls ./dist-tests/$TEMP-all-hydra/main.py
+ fi
+
  # Comment dist-tests in .gitignore to make black running on ./dist-tests folder
  sed -i "s/dist-tests/# dist-tests/g" .gitignore
 

scripts/run_tests.sh

@@ -92,6 +92,46 @@ run_spawn_fire() {
  done
 }
 
+# Hydra test functions
+
+run_simple_hydra() {
+ for dir in $(find ./dist-tests/$1-simple-hydra -type d)
+ do
+ cd $dir
+ python main.py --config-dir=../../src/tests/ci-configs --config-name=$1-simple.yaml 
+ cd $CWD
+ done
+}
+
+run_all_hydra() {
+ for dir in $(find ./dist-tests/$1-all-hydra -type d)
+ do
+ cd $dir
+ pytest -vra --color=yes --tb=short test_*.py
+ python main.py --config-dir=../../src/tests/ci-configs --config-name=$1-all.yaml
+ cd $CWD
+ done
+}
+
+run_launch_hydra() {
+ for dir in $(find ./dist-tests/$1-launch-hydra -type d)
+ do
+ cd $dir
+ torchrun --nproc_per_node 2 main.py --config-dir=../../src/tests/ci-configs --config-name=$1-launch.yaml ++backend='gloo'
+ cd $CWD
+ done
+}
+
+run_spawn_hydra() {
+ for dir in $(find ./dist-tests/$1-spawn-hydra -type d)
+ do
+ cd $dir
+ python main.py --config-dir=../../src/tests/ci-configs --config-name=$1-spawn.yaml ++backend='gloo'
+ cd $CWD
+ done
+}
+
+
 
 if [ $1 = "unzip" ]; then
  unzip_all
@@ -100,23 +140,31 @@ elif [ $1 = "simple" ]; then
  run_simple $2
  elif [ $3 = "fire" ]; then 
  run_simple_fire $2
- fi
+ elif [ $3 = "hydra" ]; then 
+ run_simple_hydra $2
+ fi 
 elif [ $1 = "all" ]; then
  if [ $3 = "argparse" ]; then 
  run_all $2
  elif [ $3 = "fire" ]; then 
  run_all_fire $2
+ elif [ $3 = "hydra" ]; then 
+ run_all_hydra $2
  fi
 elif [ $1 = "launch" ]; then
  if [ $3 = "argparse" ]; then 
  run_launch $2
  elif [ $3 = "fire" ]; then 
  run_launch_fire $2
+ elif [ $3 = "hydra" ]; then 
+ run_launch_hydra $2
  fi
 elif [ $1 = "spawn" ]; then
  if [ $3 = "argparse" ]; then 
  run_spawn $2
  elif [ $3 = "fire" ]; then 
  run_spawn_fire $2
+ elif [ $3 = "hydra" ]; then 
+ run_spawn_hydra $2
  fi
 fi

src/components/NavColab.vue

@@ -93,7 +93,8 @@ export default {
  body: JSON.stringify({
  code: store.code,
  template: store.config.template,
- config: store.config
+ config: store.config,
+ argparser: store.config.argparser
  })
  })
  // response body is plain text