diff --git a/.gitignore b/.gitignore index 1dc2d47783429f1e6653d48206f1b876af3e30ac..bf72bf18dbbb353b21509e046d928e3777af3cf3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ *.pyc -*.h5 +#*.h5 #/HousesDataset/ \ No newline at end of file diff --git a/house_prices_estimation_example_data.py b/house_prices_estimation_example_data.py index c51f2cc4d49f76f8488d1cd444c47e58528d9bf8..e95c5f7769a37dbbd13d3ea1800aa6f0460310c3 100644 --- a/house_prices_estimation_example_data.py +++ b/house_prices_estimation_example_data.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +import set_python_path from tensorflow_core.python.keras.engine.input_layer import Input from tensorflow_core.python.keras.layers.core import Dense, Dropout from tensorflow_core.python.keras.models import Sequential, Model diff --git a/house_prices_estimation_example_image.py b/house_prices_estimation_example_image.py index a2e06fbc24408d89efe2638c143b2e80e6cafac4..ab6ee293f447e1427bb2b8dcbc16942c1392fb5d 100644 --- a/house_prices_estimation_example_image.py +++ b/house_prices_estimation_example_image.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import os - +import set_python_path from tensorflow_core.python.keras.datasets import cifar10 from tensorflow_core.python.keras.engine.input_layer import Input from tensorflow_core.python.keras.layers.convolutional import Conv2D diff --git a/house_prices_estimation_example_image_and_data.py b/house_prices_estimation_example_image_and_data.py index f1d1c84f47ac9036c0f07cbd087bcbb26068611f..3e138371e1045abb1bf74f04601544c7e7de3cac 100644 --- a/house_prices_estimation_example_image_and_data.py +++ b/house_prices_estimation_example_image_and_data.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- +import set_python_path from tensorflow_core.python.keras.layers.merge import Concatenate - - from house_prices_estimation_example_data import generate_simple_regression_model from house_prices_estimation_example_image import generate_simple_cnn_regression_model diff --git a/pretrained_cifar100.h5 b/pretrained_cifar100.h5 new file mode 100644 index 0000000000000000000000000000000000000000..2a9af9e6579d195ba33ad22557a81f60e11eaf27 Binary files /dev/null and b/pretrained_cifar100.h5 differ diff --git a/set_python_path.py b/set_python_path.py new file mode 100644 index 0000000000000000000000000000000000000000..f78b3b7c8ab29724ee8f298f2fb2e0fbcb83657b --- /dev/null +++ b/set_python_path.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- +__author__ = 106360 + +import sys +import os + +curr_path = os.path.dirname(os.path.realpath(__file__)) +sys.path.append(curr_path) + diff --git a/tutorial_regression_data.ipynb b/tutorial_regression_data.ipynb index 4b81e57fcd9605d2ef04bfc2a2dd6b3316265e06..981e223e2c5925a975da44b5ce2fd3d995880112 100644 --- a/tutorial_regression_data.ipynb +++ b/tutorial_regression_data.ipynb @@ -24,7 +24,6 @@ "!pip install tensorflow-gpu==2.0.0-rc0\n", "#!sh download_dataset.sh#%% md\n", "!git clone https://git.code.tecnalia.com/comvis_public/pilula_deep_learning.git\n", - "!cd pilula_deep_learning\n", "# Test regression model" ] }, @@ -33,7 +32,11 @@ "execution_count": 11, "outputs": [], "source": [ - "from house_prices_estimation_example_data import *" + "try:\n", + " from house_prices_estimation_example_data import *\n", + "except:\n", + " from pilula_deep_learning.house_prices_estimation_example_data import *\n", + " " ], "metadata": { "collapsed": false, diff --git a/tutorial_regression_data_image.ipynb b/tutorial_regression_data_image.ipynb index 9ec7a336cde708178da9c47a2861c7f7a242be4a..d0c75d59e0689b8bbd3f177975802253cb943e3d 100644 --- a/tutorial_regression_data_image.ipynb +++ b/tutorial_regression_data_image.ipynb @@ -24,7 +24,6 @@ "!pip install tensorflow-gpu==2.0.0-rc0\n", "#!sh download_dataset.sh#%% md\n", "!git clone https://git.code.tecnalia.com/comvis_public/pilula_deep_learning.git\n", - "!cd pilula_deep_learning\n", "# Test regression model" ] }, @@ -33,7 +32,10 @@ "execution_count": 11, "outputs": [], "source": [ - "from house_prices_estimation_example_image_and_data import *" + "try:\n", + " from house_prices_estimation_example_image_and_data import *\n", + "except:\n", + " from pilula_deep_learning.house_prices_estimation_example_image_and_data import *\n" ], "metadata": { "collapsed": false, diff --git a/tutorial_regression_image_finetune.ipynb b/tutorial_regression_image_finetune.ipynb index 074dc824b9f88c066aacebf69fe936e591c8fd99..9d207bc771b1476a965489edb89aa100d9fdadaf 100644 --- a/tutorial_regression_image_finetune.ipynb +++ b/tutorial_regression_image_finetune.ipynb @@ -24,7 +24,6 @@ "!pip install tensorflow-gpu==2.0.0-rc0\n", "#!sh download_dataset.sh#%% md\n", "!git clone https://git.code.tecnalia.com/comvis_public/pilula_deep_learning.git\n", - "!cd pilula_deep_learning\n", "\n", "# Test regression model" ] @@ -34,7 +33,10 @@ "execution_count": 4, "outputs": [], "source": [ - "from house_prices_estimation_example_image import *" + "try:\n", + " from house_prices_estimation_example_image import *\n", + "except:\n", + " from pilula_deep_learning.house_prices_estimation_example_image import *\n" ], "metadata": { "collapsed": false, diff --git a/tutorial_regression_image_scratch.ipynb b/tutorial_regression_image_scratch.ipynb index a0a1618d6c3aece5b3b1ff90e82dfb86ab565cab..2cd79930ae9783001c912f7917b5c750e49d964f 100644 --- a/tutorial_regression_image_scratch.ipynb +++ b/tutorial_regression_image_scratch.ipynb @@ -23,7 +23,6 @@ "#pip install tensorflow==2.0.0-rc0\n", "!pip install tensorflow-gpu==2.0.0-rc0\n", "!git clone https://git.code.tecnalia.com/comvis_public/pilula_deep_learning.git\n", - "!cd pilula_deep_learning\n", "#!sh download_dataset.sh#%% md\n", "\n", "# Test regression model" @@ -34,7 +33,10 @@ "execution_count": 11, "outputs": [], "source": [ - "from house_prices_estimation_example_image import *" + "try:\n", + " from house_prices_estimation_example_image import *\n", + "except:\n", + " from pilula_deep_learning.house_prices_estimation_example_image import *\n" ], "metadata": { "collapsed": false,