diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3dc4ec10a96b6320fd93363150a7faf3a5518c4..1d556e8c3f67ca57977fec42e11944db94581db4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,5 @@ +# renku: v1.dev20180723 + variables: GIT_STRATEGY: fetch GIT_SSL_NO_VERIFY: "true" @@ -11,7 +13,9 @@ image_build: image: docker:stable before_script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN http://$CI_REGISTRY - script: | - CI_COMMIT_SHA_7=$(echo $CI_COMMIT_SHA | cut -c1-7) - docker build --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA_7 . - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA_7 \ No newline at end of file + script: + - CI_COMMIT_SHA_7=$(echo $CI_COMMIT_SHA | cut -c1-7) + - docker build --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA_7 . + - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA_7 + tags: + - image-build \ No newline at end of file diff --git a/.renku/metadata.yml b/.renku/metadata.yml index 248142c87371c44e77f39259eca4f5377a1a7142..23906c93c19f1aad40fe6a7a1eec69eacaac020e 100644 --- a/.renku/metadata.yml +++ b/.renku/metadata.yml @@ -19,12 +19,10 @@ http://schema.org/schemaVersion: '8' https://swissdatasciencecenter.github.io/renku-ontology#automatedTemplateUpdate: false https://swissdatasciencecenter.github.io/renku-ontology#immutableTemplateFiles: [] https://swissdatasciencecenter.github.io/renku-ontology#templateId: python-minimal -https://swissdatasciencecenter.github.io/renku-ontology#templateMetadata: '{"__template_source__": - "https://github.com/SwissDataScienceCenter/renku-project-template", "__template_ref__": - "0.1.13", "__template_id__": "python-minimal", "__namespace__": "simon.vanhemert", - "__automated_update__": true, "__repository__": "https://renkulab.io/gitlab", "__sanitized_project_name__": - "hslu-deep-learning", "__project_slug__": "simon.vanhemert/hslu-deep-learning", - "description": "", "name": "HSLU deep Learning"}' -https://swissdatasciencecenter.github.io/renku-ontology#templateReference: 0.1.13 -https://swissdatasciencecenter.github.io/renku-ontology#templateSource: https://github.com/SwissDataScienceCenter/renku-project-template -https://swissdatasciencecenter.github.io/renku-ontology#templateVersion: null +https://swissdatasciencecenter.github.io/renku-ontology#templateMetadata: '{"description": + "Deep learning project at Renkulab", "__template_source__": "renku", "__template_ref__": + "master", "__template_id__": "python-minimal", "__namespace__": "", "__sanitized_project_name__": + "", "__repository__": "", "__project_slug__": "", "name": "hslu-deep-learning"}' +https://swissdatasciencecenter.github.io/renku-ontology#templateReference: master +https://swissdatasciencecenter.github.io/renku-ontology#templateSource: renku +https://swissdatasciencecenter.github.io/renku-ontology#templateVersion: 0.12.0 diff --git a/.renku/renku.ini b/.renku/renku.ini index 033b786f7b6d2361679c27747539a58ec1713ecc..a0e8998139d96dca274397fd372ada3aed0f175d 100644 --- a/.renku/renku.ini +++ b/.renku/renku.ini @@ -1,6 +1,2 @@ [renku "interactive"] -default_url = /lab - -[renku] -lfs_threshold = 3mb - +default_url = /lab \ No newline at end of file diff --git a/.renku/template_checksums.json b/.renku/template_checksums.json index a44f9e0e4677ca70c2e47a0c02cb10d55b3e108f..45ddbb9e6546874cd136872a0c3fc3665c1e9a83 100644 --- a/.renku/template_checksums.json +++ b/.renku/template_checksums.json @@ -1 +1 @@ -{".renkulfsignore": "25702085882005ad576e6e51259eba461306b6b4be069361d54f3926d941ecfb", ".gitignore": "d890ab1ae56fa2761ba26961529e8e010fbf0e607a0fbe5364d34eeba38beab0", "requirements.txt": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", ".dockerignore": "46625726a43957a07c38550b006dd352ef85af18f7b984a1a87284001d03713a", "README.md": "da03529d4172b0054eaa7065129f3b97574ffa8f2085973f5d634ba5300e2247", "Dockerfile": "24550d7598c2cb8038c294c7ef2b2cae827457abf92d58121d8d168a03a4e0a7", "environment.yml": "f91b4d74abed097afebcfa125fd3de20614384a6555d864e4ac304fee375b27e", ".gitlab-ci.yml": "309bfbc0e2851600908f0fc430e8a41345146dca2b98eb0908f21cc1796db8ce", ".renku/renku.ini": "187a51794112821730b021723717f6680a277cc25fa07838b2e2c541a619b0a1", "data/.gitkeep": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "notebooks/.gitkeep": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"} \ No newline at end of file +{"README.md": "4db2493809b0c67da4d85e00765901a5d99c8663c7dcee44e6794b700993fddb", ".gitlab-ci.yml": "7dc37e92ee3349316d423e293da71538bae50bb386379515aba59cae84955f06", ".gitignore": "d890ab1ae56fa2761ba26961529e8e010fbf0e607a0fbe5364d34eeba38beab0", ".renkulfsignore": "25702085882005ad576e6e51259eba461306b6b4be069361d54f3926d941ecfb", ".dockerignore": "46625726a43957a07c38550b006dd352ef85af18f7b984a1a87284001d03713a", "requirements.txt": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "environment.yml": "f91b4d74abed097afebcfa125fd3de20614384a6555d864e4ac304fee375b27e", "Dockerfile": "093414748a7a7c3bdd2b7277220df677ccf6deeb212de61f9f1c61c6a2b893d4", ".renku/renku.ini": "187a51794112821730b021723717f6680a277cc25fa07838b2e2c541a619b0a1", ".renku/metadata.yml": "380aa633a150dc4df38537167986979a79e74c19ff3e074c950e1f4d8efca4b0", "data/.gitkeep": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "notebooks/.gitkeep": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 4f34d142697c04514112d6f8b1373f3ac7df13bc..f33b41ec099f2b34e86b631edf9401ff22852722 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ -# For finding latest versions of the base image see -# https://github.com/SwissDataScienceCenter/renkulab-docker -ARG RENKU_BASE_IMAGE=renku/renkulab-py:3.7-0.7.2 -FROM ${RENKU_BASE_IMAGE} +FROM renku/renkulab-py:3.7-renku0.10.4-0.6.3 +# see https://github.com/SwissDataScienceCenter/renkulab-docker +# to swap this image for the latest version available # Uncomment and adapt if code is to be included in the image # COPY src /code/src @@ -22,19 +21,4 @@ COPY requirements.txt environment.yml /tmp/ RUN conda env update -q -f /tmp/environment.yml && \ /opt/conda/bin/pip install -r /tmp/requirements.txt && \ conda clean -y --all && \ - conda env export -n "root" - -# RENKU_VERSION determines the version of the renku CLI -# that will be used in this image. To find the latest version, -# visit https://pypi.org/project/renku/#history. -ARG RENKU_VERSION=0.12.0 - -######################################################## -# Do not edit this section and do not add anything below - -RUN if [ -n "$RENKU_VERSION" ] ; then \ - pipx uninstall renku && \ - pipx install --force renku==${RENKU_VERSION} \ - ; fi - -######################################################## \ No newline at end of file + conda env export -n "root" \ No newline at end of file diff --git a/README.md b/README.md index 01e0164338d537cf4d3cf9352489bea6c703ba7b..c4cba059b545801ff7a5b1d8e8f1408922540e19 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -# HSLU deep Learning +# hslu-deep-learning + +Deep learning project at Renkulab ## Introduction diff --git a/notebooks/Block 1/Jupyter Notebook Block 1 - Introduction to Image Classification.ipynb b/notebooks/Block 1/Jupyter Notebook Block 1 - Introduction to Image Classification.ipynb index 7a15d5b93b77dcc23d7896a484aa51f90fcae01e..a9f11e4d2e3d33234fec6a4c817ee7d7cb94c870 100644 --- a/notebooks/Block 1/Jupyter Notebook Block 1 - Introduction to Image Classification.ipynb +++ b/notebooks/Block 1/Jupyter Notebook Block 1 - Introduction to Image Classification.ipynb @@ -39,7 +39,7 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": 2, "metadata": { "nbpresent": { "id": "409a1ab7-fe1d-4430-b904-7694020a6223" @@ -53,8 +53,8 @@ "traceback": [ "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m", "\u001b[0;31mFileNotFoundError\u001b[0m Traceback (most recent call last)", - "\u001b[0;32m<ipython-input-1-d20dcc958bb0>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[1;32m 7\u001b[0m \u001b[0mdict\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mpickle\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mload\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mfo\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mencoding\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;34m'bytes'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 8\u001b[0m \u001b[0;32mreturn\u001b[0m \u001b[0mdict\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 9\u001b[0;31m \u001b[0mdata_batch_1\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0munpickle\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"./Daten/data_batch_1\"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 10\u001b[0m \u001b[0mdata_batch_2\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0munpickle\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"./Daten/data_batch_2\"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 11\u001b[0m \u001b[0mdata_batch_3\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0munpickle\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"./Daten/data_batch_3\"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n", - "\u001b[0;32m<ipython-input-1-d20dcc958bb0>\u001b[0m in \u001b[0;36munpickle\u001b[0;34m(file)\u001b[0m\n\u001b[1;32m 4\u001b[0m \u001b[0;32mdef\u001b[0m \u001b[0munpickle\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mfile\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 5\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mpickle\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 6\u001b[0;31m \u001b[0;32mwith\u001b[0m \u001b[0mopen\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mfile\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m'rb'\u001b[0m\u001b[0;34m)\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0mfo\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 7\u001b[0m \u001b[0mdict\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mpickle\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mload\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mfo\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mencoding\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;34m'bytes'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 8\u001b[0m \u001b[0;32mreturn\u001b[0m \u001b[0mdict\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n", + "\u001b[0;32m<ipython-input-2-e287de61b2d8>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[1;32m 5\u001b[0m \u001b[0mdict\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mpickle\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mload\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mfo\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mencoding\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;34m'bytes'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 6\u001b[0m \u001b[0;32mreturn\u001b[0m \u001b[0mdict\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 7\u001b[0;31m \u001b[0mdata_batch_1\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0munpickle\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"./Daten/data_batch_1\"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 8\u001b[0m \u001b[0mdata_batch_2\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0munpickle\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"./Daten/data_batch_2\"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 9\u001b[0m \u001b[0mdata_batch_3\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0munpickle\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"./Daten/data_batch_3\"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n", + "\u001b[0;32m<ipython-input-2-e287de61b2d8>\u001b[0m in \u001b[0;36munpickle\u001b[0;34m(file)\u001b[0m\n\u001b[1;32m 2\u001b[0m \u001b[0;32mdef\u001b[0m \u001b[0munpickle\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mfile\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 3\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mpickle\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 4\u001b[0;31m \u001b[0;32mwith\u001b[0m \u001b[0mopen\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mfile\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m'rb'\u001b[0m\u001b[0;34m)\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0mfo\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 5\u001b[0m \u001b[0mdict\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mpickle\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mload\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mfo\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mencoding\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;34m'bytes'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 6\u001b[0m \u001b[0;32mreturn\u001b[0m \u001b[0mdict\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n", "\u001b[0;31mFileNotFoundError\u001b[0m: [Errno 2] No such file or directory: './Daten/data_batch_1'" ] } diff --git a/notebooks/Block 1/data/batches.meta b/notebooks/Block 1/data/batches.meta new file mode 100644 index 0000000000000000000000000000000000000000..c3135569dc871fb9da9db375662619b37ffe2f7d Binary files /dev/null and b/notebooks/Block 1/data/batches.meta differ diff --git a/notebooks/Block 1/data/data_batch_1 b/notebooks/Block 1/data/data_batch_1 new file mode 100644 index 0000000000000000000000000000000000000000..ab404a5ac32492b807a5c6cd02b83dc4dd5ff980 Binary files /dev/null and b/notebooks/Block 1/data/data_batch_1 differ diff --git a/notebooks/Block 1/data/data_batch_2 b/notebooks/Block 1/data/data_batch_2 new file mode 100644 index 0000000000000000000000000000000000000000..6bf1369a6cacadfdbd2f8c61e354cc7d0c17bbae Binary files /dev/null and b/notebooks/Block 1/data/data_batch_2 differ diff --git a/notebooks/Block 1/data/data_batch_3 b/notebooks/Block 1/data/data_batch_3 new file mode 100644 index 0000000000000000000000000000000000000000..66a0d630a7eb736563b1861ce716bdc489f2113b Binary files /dev/null and b/notebooks/Block 1/data/data_batch_3 differ diff --git a/notebooks/Block 1/data/data_batch_4 b/notebooks/Block 1/data/data_batch_4 new file mode 100644 index 0000000000000000000000000000000000000000..cf8d03d1e80e6d9e440d1764faa85aedd1d6b960 Binary files /dev/null and b/notebooks/Block 1/data/data_batch_4 differ diff --git a/notebooks/Block 1/data/data_batch_5 b/notebooks/Block 1/data/data_batch_5 new file mode 100644 index 0000000000000000000000000000000000000000..468b2aa538c551bc9f590f213b19d96915b85062 Binary files /dev/null and b/notebooks/Block 1/data/data_batch_5 differ diff --git a/notebooks/Block 1/data/readme.html b/notebooks/Block 1/data/readme.html new file mode 100644 index 0000000000000000000000000000000000000000..a1567d2d65ef43c349f8708e9aaf5f058d9fee77 Binary files /dev/null and b/notebooks/Block 1/data/readme.html differ diff --git a/notebooks/Block 1/data/test_batch b/notebooks/Block 1/data/test_batch new file mode 100644 index 0000000000000000000000000000000000000000..3e03f1fc5261d102600fc1c130454f1f5cda567b Binary files /dev/null and b/notebooks/Block 1/data/test_batch differ diff --git a/requirements.txt b/requirements.txt index b8730c3c9e170881a255fbd16a6cc64eb7497468..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +0,0 @@ -numpy==1.19.1 -pandas==1.1.3 -matplotlib==3.3.1 -opencv-python==4.1.2.30 -tensorflow==2.1.0 -seaborn==0.11.0 -scikit-learn==0.23.2 -vega_datasets==0.8.0 -altair==4.1.0 -mrcnn==0.2 \ No newline at end of file