Переглянути джерело

Improving install process

Updating environment.yml to install -all- requirements correctly.  Same with requirements.txt.  Simplifying colab notebook in the process
Jason Antic 6 роки тому
батько
коміт
ff89354984
5 змінених файлів з 352 додано та 282 видалено
  1. 294 0
      .gitignore
  2. 6 250
      DeOldify_colab.ipynb
  3. 13 17
      environment.yml
  4. 7 15
      requirements.txt
  5. 32 0
      setup.py

+ 294 - 0
.gitignore

@@ -34,3 +34,297 @@ test_images/Uaqapqr.jpg
 ColorizeTraining2.ipynb
 ColorizeTraining3.ipynb
 ColorizeTraining4.ipynb
+.ipynb_checkpoints/DeOldify_colab-checkpoint.ipynb
+*.pyc
+herp.jpg
+result_images/.ipynb_checkpoints/1864UnionSoldier-checkpoint.jpg
+test.py
+result_images/1850Geography.jpg
+result_images/1860Girls.jpg
+result_images/1860sSamauris.png
+result_images/1864UnionSoldier.jpg
+result_images/1867MusicianConstantinople.jpg
+result_images/1870Girl.jpg
+result_images/1870sSphinx.jpg
+result_images/1874Mexico.png
+result_images/1875Olds.jpg
+result_images/1880Paris.jpg
+result_images/1880sBrooklynBridge.jpg
+result_images/1888Slum.jpg
+result_images/1890BostonHospital.jpg
+result_images/1890CliffHouseSF.jpg
+result_images/1890sMedStudents.png
+result_images/1890sPingPong.jpg
+result_images/1890sShoeShopOhio.jpg
+result_images/1890sTouristsEgypt.png
+result_images/1890Surfer.png
+result_images/1892WaterLillies.jpg
+result_images/1895BikeMaidens.jpg
+result_images/1896NewsBoyGirl.jpg
+result_images/1897BlindmansBluff.jpg
+result_images/1899NycBlizzard.jpg
+result_images/1899SodaFountain.jpg
+result_images/1900sDaytonaBeach.png
+result_images/1900sSaloon.jpg
+result_images/1901Electrophone.jpg
+result_images/1907Cowboys.jpg
+result_images/1908FamilyPhoto.jpg
+result_images/1909Chicago.jpg
+result_images/1909ParisFirstFemaleTaxisDriver.jpg
+result_images/1910Bike.jpg
+result_images/1910Racket.png
+result_images/1916Sweeden.jpg
+result_images/1920CobblersShopLondon.jpg
+result_images/1920sDancing.jpg
+result_images/1920sFamilyPhoto.jpg
+result_images/1920sFarmKid.jpg
+result_images/1920sGuadalope.jpg
+result_images/1925Girl.jpg
+result_images/1929LondonOverFleetSt.jpg
+result_images/1930sGeorgia.jpg
+result_images/1933RockefellerCenter.jpg
+result_images/1938Reading.jpg
+result_images/1940sBeerRiver.jpg
+result_images/1946Wedding.jpg
+result_images/1948CarsGrandma.jpg
+result_images/20sWoman.jpg
+result_images/40sCouple.jpg
+result_images/abe.jpg
+result_images/AccordianKid1900Paris.jpg
+result_images/Agamemnon1919.jpg
+result_images/AirmanDad.jpg
+result_images/airmen1943.jpg
+result_images/AnselAdamsAdobe.jpg
+result_images/AnselAdamsBuildings.jpg
+result_images/AnselAdamsChurch.jpg
+result_images/AnselAdamsWhiteChurch.jpg
+result_images/AnselAdamsYosemite.jpg
+result_images/AppalachianLoggers1901.jpg
+result_images/Apsaroke1908.png
+result_images/ArkansasCowboys1880s.jpg
+result_images/AthleticClubParis1913.jpg
+result_images/AustriaHungaryWomen1890s.jpg
+result_images/BabyBigBoots.jpg
+result_images/Ballet1890Russia.jpg
+result_images/BellyLaughWWI.jpg
+result_images/bicycles.jpg
+result_images/BigManTavern1908NYC.jpg
+result_images/BombedLibraryLondon1940.jpg
+result_images/Boston1937.jpg
+result_images/BoulevardDuTemple1838.jpg
+result_images/BoxedBedEarly1900s.jpg
+result_images/BreadDelivery1920sIreland.jpg
+result_images/BritishDispatchRider.jpg
+result_images/BritishSlum.jpg
+result_images/BritishTeaBombay1890s.png
+result_images/brooklyn_girls_1940s.jpg
+result_images/BumperCarsParis1930.jpg
+result_images/CafeParis1928.jpg
+result_images/CafeTerrace1925Paris.jpg
+result_images/CalcuttaPoliceman1920.jpg
+result_images/camera_man.jpg
+result_images/Cars1890sIreland.jpg
+result_images/CatWash1931.jpg
+result_images/Chief.jpg
+result_images/ChinaOpiumc1880.jpg
+result_images/civil-war_2.jpg
+result_images/civil_war.jpg
+result_images/civil_war_3.jpg
+result_images/civil_war_4.jpg
+result_images/ClassDivide1930sBrittain.jpg
+result_images/CoalDeliveryParis1915.jpg
+result_images/Cork1905.jpg
+result_images/CorkKids1910.jpg
+result_images/CottonMill.jpg
+result_images/covered-wagons-traveling.jpg
+result_images/CricketLondon1930.jpg
+result_images/Deadwood1860s.png
+result_images/DeepSeaDiver1915.png
+result_images/Depression.jpg
+result_images/Dolores1920s.jpg
+result_images/Donegal1907Yarn.jpg
+result_images/dorothea-lange.jpg
+result_images/dorothea_lange_2.jpg
+result_images/DriveThroughGiantTree.jpg
+result_images/dustbowl_1.jpg
+result_images/dustbowl_2.jpg
+result_images/dustbowl_5.jpg
+result_images/dustbowl_people.jpg
+result_images/dustbowl_sd.jpg
+result_images/DutchBabyCoupleEllis.jpg
+result_images/EastEndLondonStreetKids1901.jpg
+result_images/EasterNyc1911.jpg
+result_images/Eddie-Adams.jpg
+result_images/Edinburgh1920s.jpg
+result_images/egypt-1.jpg
+result_images/egypt-2.jpg
+result_images/EgyptColosus.jpg
+result_images/EgyptianWomenLate1800s.jpg
+result_images/einstein_beach.jpg
+result_images/einstein_portrait.jpg
+result_images/ElectricScooter1915.jpeg
+result_images/ElephantLondon1934.png
+result_images/EmpireState1930.jpg
+result_images/Evelyn_Nesbit.jpg
+result_images/FadedDelores.PNG
+result_images/FadedDutchBabies.PNG
+result_images/FadedOvermiller.PNG
+result_images/FadedRacket.PNG
+result_images/FadedSphynx.PNG
+result_images/FarmWomen1895.jpg
+result_images/FatMenClub.jpg
+result_images/FatMensShop.jpg
+result_images/FreeportIL.jpg
+result_images/FreightTrainTeens1934.jpg
+result_images/FrenchVillage1950s.jpg
+result_images/GalwayIreland1902.jpg
+result_images/GasPrices1939.jpg
+result_images/GreatGrandparentsIrelandEarly1900s.jpg
+result_images/Greece1911.jpg
+result_images/GreekImmigrants1905.jpg
+result_images/HalloweenEarly1900s.jpg
+result_images/Harlem1932.jpg
+result_images/HarrodsLondon1920.jpg
+result_images/HealingTree.jpg
+result_images/HelenKeller.jpg
+result_images/helmut_newton-.jpg
+result_images/hemmingway.jpg
+result_images/Hemmingway2.jpg
+result_images/HerbSeller1899Paris.jpg
+result_images/HomeIreland1924.jpg
+result_images/HoovervilleSeattle1932.jpg
+result_images/HPLabelleOfficeMontreal.jpg
+result_images/HydeParkLondon1920s.jpg
+result_images/IceManLondon1919.jpg
+result_images/InuitWoman1903.png
+result_images/IrishLate1800s.jpg
+result_images/jacksonville.jpg
+result_images/Jane_Addams.jpg
+result_images/JerseyShore1905.jpg
+result_images/JudyGarland.jpeg
+result_images/Kabuki1870s.png
+result_images/KidCage1930s.png
+result_images/kids_pit.jpg
+result_images/Killarney1910.jpg
+result_images/last_samurai.jpg
+result_images/Late1800sNative.jpg
+result_images/LeBonMarcheParis1875.jpg
+result_images/LewisTomalinLondon1895.png
+result_images/LibraryOfCongress1910.jpg
+result_images/Lisbon1919.jpg
+result_images/LittleAirplane1934.jpg
+result_images/LivingRoom1920Sweeden.jpg
+result_images/Locomotive1880s.jpg
+result_images/London1850Coach.jpg
+result_images/London1900EastEndBlacksmith.jpg
+result_images/London1918WartimeClothesManufacture.jpg
+result_images/London1930sCheetah.jpg
+result_images/London1937.png
+result_images/LondonFireBrigadeMember1926.jpg
+result_images/LondonGarbageTruck1910.jpg
+result_images/LondonHeatWave1935.png
+result_images/LondonKidsEarly1900s.jpg
+result_images/LondonRailwayWork1931.jpg
+result_images/LondonSheep1920s.png
+result_images/LondonsSmallestShop1900.jpg
+result_images/LondonStreetDoctor1877.png
+result_images/LondonStreets1900.jpg
+result_images/LondonUnderground1860.jpg
+result_images/MadisonSquare1900.jpg
+result_images/MaioreWoman1895NZ.jpg
+result_images/ManPile.jpg
+result_images/marilyn_portrait.jpg
+result_images/marilyn_woods.jpg
+result_images/marktwain.jpg
+result_images/MementoMori1865.jpg
+result_images/MetropolitanDistrictRailway1869London.jpg
+result_images/Mid1800sSisters.jpg
+result_images/migrant_mother.jpg
+result_images/Mormons1870s.jpg
+result_images/MuffinManlLondon1910.jpg
+result_images/MuseauNacionalDosCoches.jpg
+result_images/NativeAmericans.jpg
+result_images/NativeCouple1912.jpg
+result_images/NativeWoman1926.jpg
+result_images/NewspaperCivilWar1863.jpg
+result_images/NewZealand1860s.jpg
+result_images/NorwegianBride1920s.jpg
+result_images/NYStreetClean1906.jpg
+result_images/opium.jpg
+result_images/OregonTrail1870s.jpg
+result_images/overmiller.jpg
+result_images/PaddingtonStationLondon1907.jpg
+result_images/PaddysMarketCork1900s.jpg
+result_images/paperboy.jpg
+result_images/Paris1899StreetDig.jpg
+result_images/Paris1920Cart.jpg
+result_images/Paris1926.jpg
+result_images/ParisLadies1910.jpg
+result_images/ParisLadies1930s.jpg
+result_images/ParisLate1800s.jpg
+result_images/ParisWomenFurs1920s.jpg
+result_images/PeddlerParis1899.jpg
+result_images/PetDucks1927.jpg
+result_images/PicadillyLate1800s.jpg
+result_images/PiggyBackRide.jpg
+result_images/pinkerton.jpg
+result_images/PlanesManhattan1931.jpg
+result_images/PostOfficeVermont1914.png
+result_images/poverty.jpg
+result_images/PuppyGify.jpg
+result_images/redwood_lumberjacks.jpg
+result_images/RepBrennanRadio1922.jpg
+result_images/rgs.jpg
+result_images/RossCorbettHouseCork.jpg
+result_images/Rottindean1890s.png
+result_images/royal_family.jpg
+result_images/RoyalUniversityMedStudent1900Ireland.jpg
+result_images/Rutherford_Hayes.jpg
+result_images/Sami1880s.jpg
+result_images/SanFran1851.jpg
+result_images/school_kids.jpg
+result_images/SchoolKidsConnemaraIreland1901.jpg
+result_images/Scotland1919.jpg
+result_images/SecondHandClothesLondonLate1800s.jpg
+result_images/SenecaNative1908.jpg
+result_images/ServantsBessboroughHouse1908Ireland.jpg
+result_images/Shack.jpg
+result_images/sioux.jpg
+result_images/skycrapper_lunch.jpg
+result_images/smoking_kid.jpg
+result_images/SoapBoxRacerParis1920s.jpg
+result_images/SoccerMotorcycles1923London.jpg
+result_images/soldier_kids.jpg
+result_images/Sphinx.jpeg
+result_images/SunHelmetsLondon1933.jpg
+result_images/SutroBaths1880s.jpg
+result_images/SynagogueInterior.PNG
+result_images/teddy_rubble.jpg
+result_images/Texas1938Woman.png
+result_images/TheatreGroupBombay1875.jpg
+result_images/TimesSquare1955.jpg
+result_images/TitanicGym.jpg
+result_images/TV1930s.jpg
+result_images/Unidentified1855.jpg
+result_images/unnamed.jpg
+result_images/VictorianDragQueen1880s.png
+result_images/VictorianLivingRoom.jpg
+result_images/ViennaBoys1880s.png
+result_images/w-b-yeats.jpg
+result_images/WalkingLibraryLondon1930.jpg
+result_images/WaltWhitman.jpg
+result_images/WaterfordIreland1909.jpg
+result_images/WestVirginiaHouse.jpg
+result_images/wh-auden.jpg
+result_images/wilson-slaverevivalmeeting.jpg
+result_images/women-bikers.png
+result_images/WomenTapingPlanes.jpg
+result_images/workers_canyon.jpg
+result_images/WorldsFair1900Paris.jpg
+result_images/WorriedKid1940sNyc.jpg
+result_images/ww1_trench.jpg
+result_images/WWIHospital.jpg
+result_images/WWIIPeeps.jpg
+result_images/WWISikhs.jpg
+result_images/ZoologischerGarten1898.jpg
+result_images/Twitter Social Icons.zip

+ 6 - 250
DeOldify_colab.ipynb

@@ -46,7 +46,7 @@
    },
    "outputs": [],
    "source": [
-    "!git clone https://github.com/jantic/fastai.git"
+    "!git clone https://github.com/jantic/DeOldify.git DeOldify"
    ]
   },
   {
@@ -63,7 +63,7 @@
    },
    "outputs": [],
    "source": [
-    "cd fastai/"
+    "cd DeOldify"
    ]
   },
   {
@@ -72,124 +72,15 @@
    "metadata": {
     "colab": {
      "base_uri": "https://localhost:8080/",
-     "height": 34
-    },
-    "colab_type": "code",
-    "id": "hfED3zwteDRZ",
-    "outputId": "b926bdb4-f48a-4a71-9ae5-0c259d9f1210"
-   },
-   "outputs": [],
-   "source": [
-    "# get rid of torch requirements\n",
-    "# they cannot be used with pip\n",
-    "%%writefile requirements.txt\n",
-    "\n",
-    "bcolz>=1.1.2\n",
-    "bleach>=2.0.0\n",
-    "certifi>=2016.2.28\n",
-    "cycler>=0.10.0\n",
-    "decorator>=4.1.2\n",
-    "entrypoints>=0.2.3\n",
-    "graphviz>=0.8.2\n",
-    "html5lib>=0.999999999\n",
-    "ipykernel>=4.6.1\n",
-    "ipython>=6.2.0\n",
-    "ipython-genutils>=0.2.0\n",
-    "ipywidgets>=7.0.1\n",
-    "isoweek>=1.3.3\n",
-    "jedi>=0.10.2\n",
-    "Jinja2>=2.9.6\n",
-    "jsonschema>=2.6.0\n",
-    "jupyter>=1.0.0\n",
-    "jupyter-client>=5.1.0\n",
-    "jupyter-console>=5.2.0\n",
-    "jupyter-core>=4.3.0\n",
-    "MarkupSafe>=1.0\n",
-    "matplotlib>=2.0.2\n",
-    "mistune>=0.7.4\n",
-    "nbconvert>=5.3.1\n",
-    "nbformat>=4.4.0\n",
-    "notebook>=5.1.0\n",
-    "numpy>=1.13.1\n",
-    "olefile>=0.44\n",
-    "opencv-python>=3.3.0.10\n",
-    "pandas>=0.20.3\n",
-    "pandas_summary>=0.0.41\n",
-    "pandocfilters>=1.4.2\n",
-    "pexpect>=4.2.1\n",
-    "pickleshare>=0.7.4\n",
-    "Pillow>=4.0.0\n",
-    "prompt-toolkit>=1.0.15\n",
-    "Pygments>=2.2.0\n",
-    "pyparsing>=2.2.0\n",
-    "pytest>=3.5.0\n",
-    "python-dateutil>=2.6.1\n",
-    "pytz>=2017.2\n",
-    "PyYAML>=3.12\n",
-    "pyzmq>=16.0.2\n",
-    "qtconsole>=4.3.1\n",
-    "scipy>=0.19.1\n",
-    "seaborn>=0.8.1\n",
-    "simplegeneric>=0.8.1\n",
-    "six>=1.11.0\n",
-    "sklearn_pandas>=1.6.0\n",
-    "terminado>=0.6\n",
-    "testpath>=0.3.1\n",
-    "tornado>=4.5.2,<5\n",
-    "tqdm>=4.15.0\n",
-    "traitlets>=4.3.2\n",
-    "wcwidth>=0.1.7\n",
-    "webencodings>=0.5.1\n",
-    "widgetsnbextension>=3.0.3\n",
-    "spacy>=2.0.11"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "colab": {
-     "base_uri": "https://localhost:8080/",
-     "height": 34
+     "height": 1295
     },
     "colab_type": "code",
-    "id": "siOwleDIeFYn",
-    "outputId": "ca02435c-1c20-43c1-b483-d5326c9b0521"
+    "id": "BMRO_XT6e_ge",
+    "outputId": "58cc061e-7547-40d9-9db2-e35cda1495f0"
    },
    "outputs": [],
    "source": [
-    "%%writefile setup.py\n",
-    "\n",
-    "# coding: utf-8\n",
-    "\n",
-    "\"\"\" Setup script for installing fastai \"\"\"\n",
-    "\n",
-    "#from distutils.core import setup\n",
-    "from setuptools import setup\n",
-    "\n",
-    "setup(\n",
-    "    name = \"fastai\",\n",
-    "    packages = ['fastai', 'fastai/models', 'fastai/models/cifar10'],\n",
-    "    version = '0.7.0',\n",
-    "    description = \"The fastai deep learning and machine learning library.\",\n",
-    "    author = \"Jeremy Howard and contributors\",\n",
-    "    author_email = \"info@fast.ai\",\n",
-    "    license = \"Apache License 2.0\",\n",
-    "    url = \"https://github.com/fastai/fastai\",\n",
-    "    download_url =  'https://github.com/fastai/fastai/archive/0.7.0.tar.gz',\n",
-    "    install_requires =\n",
-    "     ['bcolz', 'bleach', 'certifi', 'cycler', 'decorator', 'entrypoints', 'feather-format', 'graphviz', 'html5lib',\n",
-    "      'ipykernel', 'ipython', 'ipython-genutils', 'ipywidgets', 'isoweek', 'jedi', 'Jinja2', 'jsonschema', 'jupyter',\n",
-    "      'MarkupSafe', 'matplotlib', 'numpy', 'opencv-python', 'pandas',\n",
-    "      'pandas_summary', 'pickleshare', 'plotnine', 'Pygments', 'pyparsing', 'python-dateutil', 'pytz', 'PyYAML', 'pyzmq', 'scipy',\n",
-    "      'seaborn', 'simplegeneric', 'sklearn_pandas', 'testpath', 'tornado', 'tqdm',\n",
-    "      'traitlets', 'wcwidth', 'webencodings', 'widgetsnbextension'],\n",
-    "    keywords = ['deeplearning', 'pytorch', 'machinelearning'],\n",
-    "    classifiers = ['Development Status :: 3 - Alpha',\n",
-    "                   'Programming Language :: Python',\n",
-    "                   'Programming Language :: Python :: 3.6',\n",
-    "                   'Topic :: Scientific/Engineering :: Artificial Intelligence']\n",
-    ")"
+    "!pip install -e ."
    ]
   },
   {
@@ -206,61 +97,11 @@
    },
    "outputs": [],
    "source": [
-    "from os import path\n",
-    "from wheel.pep425tags import get_abbr_impl, get_impl_ver, get_abi_tag\n",
-    "platform = '{}{}-{}'.format(get_abbr_impl(), get_impl_ver(), get_abi_tag())\n",
-    "\n",
-    "accelerator = 'cu80' if path.exists('/opt/bin/nvidia-smi') else 'cpu'\n",
-    "\n",
-    "!pip install -q http://download.pytorch.org/whl/{accelerator}/torch-0.4.1-{platform}-linux_x86_64.whl torchvision\n",
     "import torch\n",
     "print(torch.__version__)\n",
     "print(torch.cuda.is_available())"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "colab": {
-     "base_uri": "https://localhost:8080/",
-     "height": 136
-    },
-    "colab_type": "code",
-    "id": "ukunVF-ue2n-",
-    "outputId": "f732518b-3aec-4ec3-a5c4-5dea4a8ed528"
-   },
-   "outputs": [],
-   "source": [
-    "!pip install torchtext==0.2.3"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "colab": {
-     "base_uri": "https://localhost:8080/",
-     "height": 1295
-    },
-    "colab_type": "code",
-    "id": "BMRO_XT6e_ge",
-    "outputId": "58cc061e-7547-40d9-9db2-e35cda1495f0"
-   },
-   "outputs": [],
-   "source": [
-    "!pip install -e ."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "!pip install Pillow==4.1.1"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -275,74 +116,6 @@
     "from fastai import *"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "colab": {
-     "base_uri": "https://localhost:8080/",
-     "height": 632
-    },
-    "colab_type": "code",
-    "id": "cqLT9K7Hfbz-",
-    "outputId": "640e9093-0ad0-4d2b-c776-bbbcb2e73b60"
-   },
-   "outputs": [],
-   "source": [
-    "!pip install jupyterlab"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "colab": {
-     "base_uri": "https://localhost:8080/",
-     "height": 34
-    },
-    "colab_type": "code",
-    "id": "DJf1jnzXfhtr",
-    "outputId": "6ca141bc-eda3-4c80-d7ef-35bd5808299e"
-   },
-   "outputs": [],
-   "source": [
-    "cd .."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "colab": {
-     "base_uri": "https://localhost:8080/",
-     "height": 136
-    },
-    "colab_type": "code",
-    "id": "yn9okAKafoIB",
-    "outputId": "e69f1aa5-12a2-4340-cbfe-35bdef45874c"
-   },
-   "outputs": [],
-   "source": [
-    "!git clone https://github.com/jantic/DeOldify.git"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "colab": {
-     "base_uri": "https://localhost:8080/",
-     "height": 34
-    },
-    "colab_type": "code",
-    "id": "rzsIk5PwgVvR",
-    "outputId": "b8e9a216-28be-4d20-ce90-7fd9dbdd587a"
-   },
-   "outputs": [],
-   "source": [
-    "cd DeOldify/"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -358,23 +131,6 @@
     "%autoreload 2"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "colab": {
-     "base_uri": "https://localhost:8080/",
-     "height": 102
-    },
-    "colab_type": "code",
-    "id": "cA7U8bE8geHc",
-    "outputId": "860952d7-0218-4c2c-ff24-a4b77986536b"
-   },
-   "outputs": [],
-   "source": [
-    "!pip install tensorboardX"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,

+ 13 - 17
environment.yml

@@ -1,4 +1,4 @@
-name: fastai
+name: deoldify
 channels:
 - fastai
 - pytorch
@@ -30,20 +30,17 @@ dependencies:
 - ipywidgets
 - jedi
 - jinja2
-- jsonschema
-- jupyter
-- jupyter_client
-- jupyter_console
-- jupyter_core
-#- conda-forge::jupyter_contrib_nbextensions
+- jsonschema 
 - libiconv
 - libpng
 - libsodium
+- lxml==4.2.1
 - libxml2
 - markupsafe
 - matplotlib
 - mistune
 - mkl
+- nbconvert
 - nbformat
 - notebook
 - numpy
@@ -77,8 +74,7 @@ dependencies:
 - six
 - sqlite
 - statsmodels
-- testfixtures
-- testpath>=0.4.2
+- testpath
 - tk
 - tornado<5
 - tqdm
@@ -88,22 +84,22 @@ dependencies:
 - widgetsnbextension
 - xz
 - zeromq
-- pytorch<0.4
+- pytorch>=0.4.1
 - bcolz
 - prompt_toolkit
-#- pytest
-- cython
+- pytest
 - pip:
-  - torchvision>=0.1.9
+  - tensorflow-gpu
+  - torchvision>=0.2.0
   - opencv-python
   - isoweek
   - pandas_summary==0.0.5
-  - torchtext==0.2.3
+  - torchtext
   - graphviz
   - sklearn_pandas
   - feather-format
-#  - plotnine
+  - plotnine
   - kaggle-cli
   - ipywidgets
-  - nbconvert
-  - PyHamcrest
+  - jupyterlab>=0.34.3
+  - tensorboardX

+ 7 - 15
requirements.txt

@@ -14,12 +14,7 @@ isoweek>=1.3.3
 jedi>=0.10.2
 Jinja2>=2.9.6
 jsonschema>=2.6.0
-jupyter>=1.0.0
-jupyter-client>=5.1.0
-jupyter-console>>=5.2.0
-jupyter-core>>=4.3.0
-jupyterlab>=0.35.4
-jupyterlab-server>=0.2.0
+jupyterlab>=0.34.3
 MarkupSafe>=1.0
 matplotlib>=2.0.2
 mistune>=0.7.4
@@ -30,16 +25,17 @@ numpy>=1.13.1
 olefile>=0.44
 opencv-python>=3.3.0.10
 pandas>=0.20.3
-pandas_summary>=0.0.4
+pandas_summary>=0.0.41
 pandocfilters>=1.4.2
 pexpect>=4.2.1
 pickleshare>=0.7.4
-Pillow>=4.2.1
+Pillow==4.1.1
 prompt-toolkit>=1.0.15
 Pygments>=2.2.0
 pyparsing>=2.2.0
 pytest>=3.5.0
 python-dateutil>=2.6.1
+pytorch>=0.4.1
 pytz>=2017.2
 PyYAML>=3.12
 pyzmq>=16.0.2
@@ -49,16 +45,12 @@ seaborn>=0.8.1
 simplegeneric>=0.8.1
 six>=1.11.0
 sklearn_pandas>=1.6.0
+tensorboardX>=1.4
 terminado>=0.6
 testpath>=0.3.1
-tensorboard==1.12.0
-tensorboardX==1.4
-tensorflow==1.12.0
-tensorflow-hub==0.1.1
-tornado>=4.5.2,<5
-torch==0.4.1
 torchtext==0.2.3
-torchvision==0.2.1
+torchvision>=0.2.0
+tornado>=4.5.2,<5
 tqdm>=4.15.0
 traitlets>=4.3.2
 wcwidth>=0.1.7

+ 32 - 0
setup.py

@@ -0,0 +1,32 @@
+%%writefile setup.py
+
+# coding: utf-8
+
+""" Setup script for installing fastai """
+
+#from distutils.core import setup
+from setuptools import setup
+
+setup(
+    name = "fastai",
+    packages = ['fastai', 'fastai/models', 'fastai/models/cifar10'],
+    version = '0.7.0',
+    description = "The fastai deep learning and machine learning library.",
+    author = "Jeremy Howard and contributors",
+    author_email = "info@fast.ai",
+    license = "Apache License 2.0",
+    url = "https://github.com/fastai/fastai",
+    download_url =  'https://github.com/fastai/fastai/archive/0.7.0.tar.gz',
+    install_requires =
+     ['bcolz', 'bleach', 'certifi', 'cycler', 'decorator', 'entrypoints', 'feather-format', 'graphviz', 'html5lib',
+      'ipykernel', 'ipython', 'ipython-genutils', 'ipywidgets', 'isoweek', 'jedi', 'Jinja2', 'jsonschema', 'jupyter',
+      'MarkupSafe', 'matplotlib', 'numpy', 'opencv-python', 'pandas',
+      'pandas_summary', 'pickleshare', 'plotnine', 'Pygments', 'pyparsing', 'python-dateutil', 'pytz', 'PyYAML', 'pyzmq', 'scipy',
+      'seaborn', 'simplegeneric', 'sklearn_pandas', 'testpath', 'tornado', 'tqdm',
+      'traitlets', 'wcwidth', 'webencodings', 'widgetsnbextension'],
+    keywords = ['deeplearning', 'pytorch', 'machinelearning'],
+    classifiers = ['Development Status :: 3 - Alpha',
+                   'Programming Language :: Python',
+                   'Programming Language :: Python :: 3.6',
+                   'Topic :: Scientific/Engineering :: Artificial Intelligence']
+)