Skip to content

Commit

Permalink
Tf install experimental (#2)
Browse files Browse the repository at this point in the history
* Fix visualization when palette is None (NVIDIA#1177)

The palette may be `None`when working with grayscale labels.
Fix NVIDIA#1147

* Bugfix for customizing previous models (NVIDIA#1202)

* [Packaging] Disable tests (NVIDIA#1227)

* [Tests] Skip if extension not installed (NVIDIA#1263)

* [Docs] Fix spelling errors in comments

* [Docs] Add note about torch pkg and cusparse (NVIDIA#1303)

* [Docs] Add note about torch pkg and cusparse (NVIDIA#1303)

* [Caffe] Fix batch accumulation bug (NVIDIA#1307)

* Use official NVIDIA model store by default (NVIDIA#1308)

* Mark v5.0.0

* [Packaging] Pull latest docker image before build

* Add .pgm to list of supported image file formats

* Restrict usage of cmap to labels DB in generic dataset exploration

fix NVIDIA#1322

* Update Object Detection example doc (NVIDIA#1323)

* Update Object Detection example doc (NVIDIA#1323)

* [TravisCI] Cache local OpenBLAS build

This fixes a Torch bug we've been having on Travis for a while now.

We had only been building OpenBLAS from source when there was no cached
torch build present on the build machine. That meant you could get a
cached build of Torch which was built against one version of OpenBLAS,
but the system actually installed an older version. This led to memory
corruption and segmentation faults.

* [Tests] Skip if extension not installed (part 2) (NVIDIA#1337)

* [TravisCI] Install all plugins by default

Also test no plugins

* [Tests] Skip if extension not installed (NVIDIA#1337)

* [Docs] Update model store documentation (NVIDIA#1346)

TODO: add a screenshot of the official model store once approved

* [Docs] Update model store documentation (NVIDIA#1346)

TODO: add a screenshot of the official model store once approved

* Add steps to specify the Python layer file (NVIDIA#1347)

* Add steps to specify the Python layer file (NVIDIA#1347)

* [Docs] Install minimal boost libs for caffe

* Remove the selenium walkthrough

* Update copyright year for 2017

* Add a few missing copyright notices

* Fix Siamese example

Broadcast -1 into all elements that equal 0 in original label.

* Fix Siamese example (NVIDIA#1405)

Broadcast -1 into all elements that equal 0 in original label.

* [Packaging] Make nginx site easier to customize

* Fix documentation typo. train.txt and test.txt was swapped and shown in the wrong folders for mnist and cifar10 data sets.

* Document a cuDNN workaround for text example (NVIDIA#1422)

* Document a cuDNN workaround for text example (NVIDIA#1422)

* Correct shebang for prepare_pascal_voc_data.sh (NVIDIA#1450)

* [Docs] Document workaround for torch+hdf5 error

* Fix typo in ModelStore.md

* Fix typo in medical-imaging/README.md

* Fix bash lint with shellcheck

* Fix bugs when visiting nested image folder

* Fix shellcheck-related bug in PPA upload script

* Copy labels.txt inside the dataset

Move import to the top

* Fix Distribution Graph

Move backwards-compatibility to setstate

* Fix typo in Sunnybrook plug-in

* Fix a bug introduced when fixing shellcheck lint

* Fix another shellcheck-related bug

* Fix table formatting in README.md

Fix table formatting

* Clamp distance values from segementation boundaries before begin converted to uint8. That was causing banding in the image because of wrapping at V % 256

* lint

* [Docs] 5.0 debs and Ubuntu 16.04 support

* WIP lint fix

* Linted most of what I can lint prior to asking for context

* updated the model store urls in the readme

* added debugs in build scripts to understand the point of failure

* added travis wait to install openblas

* removed tensorflow to the build process to see if affects openblas

* removed suppressing log contents

* added set -x

* fixed control

* re-enabling tensorflow to see if travis builds

* updated the version of numpy to ensure a stable build for travis wrt to open issue 8653 on numpy github

* forcing numpy to v 1.8.1

* added the official store image and updated the documentation (NVIDIA#1650)

* [TravisCI] Add `git fetch --unshallow` for DIST

Useful for TravisCI builds in forks.

* Got travis script to work for tensorflow installation
  • Loading branch information
ethantang95 committed Jun 1, 2017
1 parent 2db4f57 commit 58c90b9
Show file tree
Hide file tree
Showing 329 changed files with 918 additions and 929 deletions.
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,4 @@ TAGS

#.project
.project


/examples/binary-segmentation/out/
/examples/binary-segmentation/out2/
/.project
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved.

os: linux
dist: trusty
sudo: required
Expand All @@ -9,7 +10,6 @@ env:
global:
- CAFFE_ROOT=~/caffe
- TORCH_ROOT=~/torch
# Fixes for Torch and OpenBLAS
- OMP_NUM_THREADS=1
- OPENBLAS_MAIN_FREE=1
- secure: "WSqrE+PQm76DdoRLRGKTK6fRWfXZjIb0BWCZm3IgHgFO7OE6fcK2tBnpDNNw4XQjmo27FFWlEhxN32g18P84n5PvErHaH65IuS9Nv6FkLlPXZlVqGNxbPmEA4oTkD/6Y6kZyZWZtLh2+/1ijuzQAPnIy/4BEuL8pdO+PsoJ9hYM="
Expand All @@ -19,6 +19,7 @@ env:
- DIGITS_TEST_FRAMEWORK=torch
- DIGITS_TEST_FRAMEWORK=tensorflow
- DIGITS_TEST_FRAMEWORK=none
- DIGITS_TEST_FRAMEWORK=none WITH_PLUGINS=false

matrix:
include:
Expand All @@ -42,6 +43,7 @@ matrix:
- dput
- gnupg
install:
- git fetch --unshallow
- git remote add nvidia-digits-upstream https://github.com/NVIDIA/DIGITS.git # for forks
- git fetch nvidia-digits-upstream --tags
- pip install twine
Expand Down Expand Up @@ -128,13 +130,12 @@ install:
- mkdir -p ~/.config/matplotlib
- echo "backend:agg" > ~/.config/matplotlib/matplotlibrc
- ./scripts/travis/install-caffe.sh $CAFFE_ROOT
- if [ "$DIGITS_TEST_FRAMEWORK" == "torch" ]; then travis_wait ./scripts/travis/install-torch.sh $TORCH_ROOT; else unset TORCH_ROOT; fi
- if [ "$DIGITS_TEST_FRAMEWORK" == "tensorflow" ]; then travis_wait ./scripts/travis/install-tensorflow.sh; fi
- if [ "$DIGITS_TEST_FRAMEWORK" == "torch" ]; then travis_wait ./scripts/travis/install-torch.sh $TORCH_ROOT; else unset TORCH_ROOT; fi
- pip install -r ./requirements.txt
- pip install -r ./requirements_test.txt
- pip install -e .
- pip install -e ./plugins/data/imageGradients
- pip install -e ./plugins/view/imageGradients
- if [ "$WITH_PLUGINS" != "false" ]; then find ./plugins/*/* -maxdepth 0 -type d | xargs -n1 pip install -e; fi

script:
- ./digits-test -v
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved.
Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ DIGITS (the **D**eep Learning **G**PU **T**raining **S**ystem) is a webapp for t

| Installation method | Supported platform[s] | Available versions | Instructions |
| --- | --- | --- | --- |
| Deb packages | Ubuntu 14.04 | [14.04 repo](http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1404/x86_64) | [docs/UbuntuInstall.md](docs/UbuntuInstall.md) |
| Deb packages | Ubuntu 14.04, 16.04 | [14.04 repo](http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1404/x86_64), [16.04 repo](http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1604/x86_64) | [docs/UbuntuInstall.md](docs/UbuntuInstall.md) |
| Docker | Linux | [DockerHub tags](https://hub.docker.com/r/nvidia/digits/tags/) | [nvidia-docker wiki](https://github.com/NVIDIA/nvidia-docker/wiki/DIGITS) |
| Source | Ubuntu 14.04, 16.04 | [GitHub tags](https://github.com/NVIDIA/DIGITS/releases) | [docs/BuildDigits.md](docs/BuildDigits.md) |

Expand Down
2 changes: 1 addition & 1 deletion digits-devserver
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved.

set -e

Expand Down
2 changes: 1 addition & 1 deletion digits-lint
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved.

set -e

Expand Down
2 changes: 1 addition & 1 deletion digits-test
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved.

set -e

Expand Down
240 changes: 0 additions & 240 deletions digits-walkthrough

This file was deleted.

2 changes: 1 addition & 1 deletion digits/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved.
from __future__ import absolute_import

from .version import __version__
Expand Down
2 changes: 1 addition & 1 deletion digits/__main__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved.

import argparse
import os.path
Expand Down
2 changes: 1 addition & 1 deletion digits/config/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved.
from __future__ import absolute_import

# Create this object before importing the following imports, since they edit the list
Expand Down
2 changes: 1 addition & 1 deletion digits/config/caffe.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved.
from __future__ import absolute_import

import imp
Expand Down
2 changes: 1 addition & 1 deletion digits/config/gpu_list.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved.
from __future__ import absolute_import

from . import option_list
Expand Down
2 changes: 1 addition & 1 deletion digits/config/jobs_dir.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved.
from __future__ import absolute_import

import os
Expand Down
2 changes: 1 addition & 1 deletion digits/config/log_file.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved.
from __future__ import absolute_import

import logging
Expand Down
2 changes: 1 addition & 1 deletion digits/config/server_name.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved.
from __future__ import absolute_import

import os
Expand Down
4 changes: 2 additions & 2 deletions digits/config/store_option.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved.
from __future__ import absolute_import

import os
Expand Down Expand Up @@ -29,7 +29,7 @@ def load_url_list():
if 'DIGITS_MODEL_STORE_URL' in os.environ:
url_list = os.environ['DIGITS_MODEL_STORE_URL']
else:
url_list = ""
url_list = "http://developer.download.nvidia.com/compute/machine-learning/modelstore/5.0"

return validate(url_list).split(',')

Expand Down

0 comments on commit 58c90b9

Please sign in to comment.