Merge branch 'master' into develop

.travis.yml

@@ -6,6 +6,7 @@ before_install:
 install:
 - pip install -r requirements.txt --quiet
 - pip install mkdocs
+- pip install mkdocs-material
 script:
 - pytest tests --cov=autokeras
 - sh docs.sh

examples/load_raw_image/load.py

@@ -0,0 +1,31 @@
+#To run first unzip ../load_raw_image_data.zip into ../
+# so the train and test directories reside in this directory 
+
+from autokeras.image_supervised import load_image_dataset
+from keras.datasets import mnist
+from autokeras import ImageClassifier
+
+
+def load_images():
+    x_train, y_train = load_image_dataset(csv_file_path="train/label.csv",
+                                          images_path="train")
+    print(x_train.shape)
+    print(y_train.shape)
+
+    x_test, y_test = load_image_dataset(csv_file_path="test/label.csv",
+                                        images_path="test")
+    print(x_test.shape)
+    print(y_test.shape)
+    return x_train, y_train, x_test, y_test
+
+def run():
+    x_train, y_train, x_test, y_test = load_images()
+    #After loading train and evaluate classifier.
+    clf = ImageClassifier(verbose=True, augment=False)
+    clf.fit(x_train, y_train, time_limit=12 * 60 * 60)
+    clf.final_fit(x_train, y_train, x_test, y_test, retrain=True)
+    y = clf.evaluate(x_test, y_test)
+    print(y * 100)
+
+if __name__ == '__main__':
+    run()

mkdocs/mkdocs.yml

@@ -1,10 +1,15 @@
 site_name: Auto-Keras
+theme:
+  name: 'material'
+  palette:
+    primary: 'teal'
+    accent: 'teal'
 repo_url: https://github.com/jhfjhfj1/autokeras
 site_url: http://autokeras.com
-edit_uri: https://github.com/jhfjhfj1/autokeras/blob/master/mkdocs/docs/
+edit_uri: ""
 google_analytics: ['UA-44322747-3', 'autokeras.com']
 
-pages:
+nav:
     - Home: index.md
     - Getting Started: start.md
     - Contributing Guide: temp/contribute.md
@@ -18,4 +23,3 @@ pages:
       - utils: temp/utils.md
       - generator: temp/generator.md
     - About: about.md
-theme: readthedocs

setup.py

@@ -5,12 +5,12 @@
     packages=['autokeras'],  # this must be the same as the name above
     install_requires=['torch==0.4.1', 'torchvision==0.2.1', 'numpy>=1.14.5', 'keras==2.2.2', 'scikit-learn==0.19.1',
                       'tensorflow>=1.10.0', 'tqdm==4.25.0'],
-    version='0.2.12',
+    version='0.2.13',
     description='AutoML for deep learning',
     author='Haifeng Jin',
     author_email='jhfjhfj1@gmail.com',
     url='http://autokeras.com',
-    download_url='https://github.com/jhfjhfj1/autokeras/archive/0.2.12.tar.gz',
+    download_url='https://github.com/jhfjhfj1/autokeras/archive/0.2.13.tar.gz',
     keywords=['automl'],  # arbitrary keywords
     classifiers=[]
 )