Merge branch 'dev'

Former-commit-id: 765e9131e1 [formerly 646c91e0b7] [formerly 5f6a0452d2 [formerly be775e2671]] [formerly 5c78526424 [formerly 019627e964] [formerly 5658527c80 [formerly 2a2367c0d2]]] [formerly 2c2ff872a3 [formerly 3d513124a6] [formerly bba6713eae [formerly 2d286b2b7d]] [formerly 8fa8e9b4f5 [formerly 30f2a080bc] [formerly e303b8ca59 [formerly a85d9093d9]]]] [formerly a1a8be5455 [formerly aa4fc781e0] [formerly 644b63d839 [formerly 964b6095a7]] [formerly 3ab692edf4 [formerly d0d212927e] [formerly 8dce463269 [formerly 77c9f7ae30]]] [formerly 72ee2626d3 [formerly b8a7fe50d6] [formerly 63457729da [formerly 38e6ca1ee4]] [formerly 6b2e0d0fca [formerly 76334408ab] [formerly fca2239c5e [formerly 07c6364159]]]]] [formerly 42114aa18e [formerly 0b1c76adea] [formerly b7ede5be65 [formerly a2106e8176]] [formerly 9b130aa1a2 [formerly 00ce3974ff] [formerly 95088a0edb [formerly 043c7b1aea]]] [formerly e5422d2cbf [formerly a69e0bd06e] [formerly f532d8e2a3 [formerly dc8258aa14]] [formerly 99030fc850 [formerly 59cc4c6c15] [formerly 7fcad82edf [formerly afe6bf171d]]]] [formerly c0cb52cab1 [formerly 49edb8e932] [formerly 0e3231f4fe [formerly 8e33d174e5]] [formerly c10e166ec7 [formerly ce1b99283d] [formerly b551b3c296 [formerly 8e6339cb55]]] [formerly e97170e90d [formerly 7ab345d782] [formerly aa6e302b39 [formerly 81038c5cf0]] [formerly 2f04fc0d9f [formerly 7f14a6cb7d] [formerly cd6811cada [formerly 184479701c]]]]]]
Former-commit-id: 27cf46ffab [formerly 794b0c4bcc] [formerly 6899336845 [formerly 71409a7e64]] [formerly 35c8ab6434 [formerly 92af12304f] [formerly 859782ecf6 [formerly 6155aad2ed]]] [formerly 05355445a1 [formerly 8d2f2f6bca] [formerly 71fab0d993 [formerly 48b7795bcb]] [formerly d040fabffd [formerly e50c1336c4] [formerly 7fc7583ffa [formerly ae1834eb81]]]] [formerly 30e29a0942 [formerly a21f7915be] [formerly 965e321fae [formerly fa0a61dba8]] [formerly a803bde349 [formerly 85c76c8cd7] [formerly 3a5c205361 [formerly a6d4e5fd6e]]] [formerly 349aec3943 [formerly 0280bebfee] [formerly 83963b6880 [formerly 5ebc5bc82b]] [formerly 4bed0b641b [formerly 9924bd4388] [formerly cd6811cada]]]]
Former-commit-id: 76dbccbbfe [formerly 693965ff09] [formerly bd22d21a30 [formerly 1fe74dd3b9]] [formerly befd7e1aca [formerly 7baec2c0d0] [formerly 7f49a70b85 [formerly 433369dddc]]] [formerly 462be3192e [formerly 92a4f32f65] [formerly 2ed9e6cdc6 [formerly 03f9dc4ea2]] [formerly ed9b88d9e3 [formerly f1a54d7702] [formerly f06d86c79b [formerly 27554e518f]]]]
Former-commit-id: 16a9d22a5c [formerly 16423043d4] [formerly 54fb4ee7d6 [formerly eba50956b6]] [formerly 32a9e90da2 [formerly d618305824] [formerly cdf1ba1036 [formerly adad6c55e1]]]
Former-commit-id: 67372a8a3e [formerly d2de35f644] [formerly 1a0bdd7ea1 [formerly 481d3a1d5a]]
Former-commit-id: 88ade2a044 [formerly 15b7f6c867]
Former-commit-id: 1e5f38b0c0

.install.sh

@@ -1,23 +0,0 @@
-pip install -r requirements.txt
-
-cd d3m
-pip install -e .
-cd ..
-
-cd tods/common-primitives
-pip install -e .
-cd ../..
-
-cd tods/common-primitives/sklearn-wrap
-pip install -e .
-cd ../../..
-
-cd tods 
-pip3 install -e .
-cd ..
-
-cd axolotl
-pip3 install -e .
-pip3 install -e .[cpu]
-cd ..
-

examples/evaluate_default_pipeline.py

@@ -1,24 +0,0 @@
-import pandas as pd
-
-from searcher import schemas as schemas_utils
-from searcher.utils import generate_dataset_problem, evaluate_pipeline
-
-table_path = 'datasets/yahoo_sub_5.csv'
-target_index = 6 # what column is the target
-
-#table_path = 'datasets/NAB/realTweets/labeled_Twitter_volume_IBM.csv' # The path of the dataset
-time_limit = 30 # How many seconds you wanna search
-#metric = 'F1' # F1 on label 1
-metric = 'F1_MACRO' # F1 on both label 0 and 1
-
-# Read data and generate dataset and problem
-df = pd.read_csv(table_path)
-dataset, problem_description = generate_dataset_problem(df, target_index=target_index, metric=metric)
-
-# Load the default pipeline
-pipeline = schemas_utils.load_default_pipeline()
-
-# Run the pipeline
-pipeline_result = evaluate_pipeline(problem_description, dataset, pipeline)
-print(pipeline_result)
-

examples/run_pipeline.py

@@ -15,7 +15,7 @@ parser.add_argument('--target_index', type=int, default=6,
                     help='Index of the ground truth (for evaluation)')
 parser.add_argument('--metric',type=str, default='F1_MACRO',
                     help='Evaluation Metric (F1, F1_MACRO)')
-parser.add_argument('--pipeline_path', default=os.path.join(this_path, '../tods/tods/resources/default_pipeline.json'),
+parser.add_argument('--pipeline_path', default=os.path.join(this_path, '../tods/resources/default_pipeline.json'),
                     help='Input the path of the pre-built pipeline description')
 
 args = parser.parse_args()

requirements.txt

@@ -1,34 +1,3 @@
-scikit-learn==0.22.0
-pytypes==1.0b5
-frozendict==1.2
-numpy>=1.15.4,<=1.18.1
-jsonschema==2.6.0
-requests>=2.19.1,<=2.22.0
-strict-rfc3339==0.7
-rfc3987==1.3.8
-webcolors>=1.8.1,<=1.10
-dateparser>=0.7.0,<=0.7.2
-python-dateutil==2.8.1
-pandas==0.25.0
-typing-inspect==0.5.0
-GitPython>=2.1.11,<=3.0.5
-jsonpath-ng==1.4.3
-custom-inherit>=2.2.0,<=2.2.2
-PyYAML>=5.1,<=5.3
-pycurl>=7.43.0.2,<=7.43.0.3
-pyarrow==0.15.1
-gputil>=1.3.0,<=1.4.0
-pyrsistent>=0.14.11,<=0.15.7
-scipy>=1.2.1,<=1.4.1
-openml==0.10.1
-lightgbm>=2.2.2,<=2.3.0
-opencv-python-headless<=4.1.1.26,>=4.1
-imageio>=2.3.0,<=2.6.0
-pillow==6.2.1
-xgboost>=0.81,<=0.90
-Jinja2==2.9.4
-simplejson==3.12.0
-gitdb2==2.0.6
 -e git+https://github.com/tods-doc/d3m@70aeefed6b7307941581357c4b7858bb3f88e1da#egg=d3m
 -e git+https://github.com/tods-doc/axolotl@af54e6970476a081bf0cd65990c9f56a1200d8a2#egg=axolotl
 -e git+https://gitlab.com/datadrivendiscovery/common-primitives.git@046b20d2f6d4543dcbe18f0a1d4bcbb1f61cf518#egg=common_primitives

setup.py

@@ -41,7 +41,6 @@ setup(
         'nimfa==1.4.0',
         'stumpy==1.4.0',
         'more-itertools==8.5.0',
-        'gitdb==0.6.4'
     ],
 
     entry_points = merge_entry_points()