Merge pull request #263 from ardunn/master

add CI for 3.6
hackingmaterials · Nov 10, 2019 · 3be037c · 3be037c
2 parents a9324d8 + 1165554
commit 3be037c
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -34,6 +34,38 @@ jobs:
           key: v1-dependencies-{{ checksum "requirements.txt" }}
 
 
+  py367:
+    working_directory: ~/py367_automatminer
+    docker:
+      - image: circleci/python:3.6.7
+        environment:
+          SKIP_INTENSIVE: 1
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      # Try commenting this out if there are ContextualVersionConflict errors
+      #      - restore_cache:
+      #          keys:
+      #          - v1-dependencies-{{ checksum "requirements.txt" }}
+      #           fallback to using the latest cache if no exact match is found
+      #          - v1-dependencies-
+
+      - run:
+          name: setup env and run tests
+          command: |
+
+            source dev_scripts/setup_env.sh
+            source dev_scripts/run_tests.sh
+
+          no_output_timeout: 10m
+
+      - save_cache:
+          paths:
+            - ./test_env
+          key: v1-dependencies-{{ checksum "requirements.txt" }}
+
+
   code_style:
     working_directory: ~/py372_automatminer
     docker:
@@ -62,10 +94,10 @@ jobs:
           key: v1-dependencies-{{ checksum "requirements.txt" }}
 
 
-
 workflows:
   version: 2
   run_tests_on_commit:
     jobs:
       - py372
+      - py367
       - code_style
diff --git a/automatminer_dev/submit.py b/automatminer_dev/submit.py
@@ -26,7 +26,7 @@
             "max_eval_time_mins": 20,
             "population_size": 200,
             #todo: change this back
-            # "memory": "auto",
+            "memory": "auto",
             "n_jobs": N_JOBS,
         },
         # "reducer_kwargs": {"reducers": ("corr",)},
@@ -80,9 +80,11 @@
 
     from automatminer_dev.config import EXPT_IS_METAL, EXPT_GAP, MP_E_FORM
     worker = "lrc"
+    # wf = wf_benchmark(worker, pipe_config, **EXPT_IS_METAL, cache=True, tags=tags, prepend_name="live run")
+    wf = wf_benchmark(worker, pipe_config, **EXPT_GAP, cache=True, tags=tags, prepend_name="live run")
+
+    # wf = wf_benchmark(worker, pipe_config, **EXPT_GAP, cache=True, tags=tags)
     # wf = wf_benchmark(worker, pipe_config, **EXPT_IS_METAL, cache=True, tags=tags)
-    wf = wf_benchmark(worker, pipe_config, **EXPT_GAP, cache=True, tags=tags)
-    # wf = wf_benchmark(worker, pipe_config_debug, **EXPT_IS_METAL, cache=True, tags=tags)
     # wf = wf_benchmark(worker, pipe_config_debug, **EXPT_GAP, cache=True, tags=tags)
 
 

diff --git a/automatminer_dev/workflows/bench.py b/automatminer_dev/workflows/bench.py
@@ -143,6 +143,7 @@ def wf_benchmark(
     return_fireworks=False,
     add_dataset_to_names=True,
     build_id=None,
+    prepend_name="",
 ):
     if fworker not in VALID_FWORKERS:
         raise ValueError("fworker must be in {}".format(VALID_FWORKERS))
@@ -225,6 +226,9 @@ def wf_benchmark(
         return links, connected_to_top_wf, fw_consolidate
     else:
         wf_name = "benchmark {}: ({}) [{}]".format(benchmark_hash, name, fworker)
+        if prepend_name:
+            wf_name = "<<{}>> {}".format(prepend_name, wf_name)
+
         wf = Workflow(
             list(links.keys()),
             links_dict=links,