[Release] 0.1.2 updates (dmlc#276)

* 0.1.2 release * oops * more fixes on windows * [Bugfix] fix download dir (dmlc#275) * fix download dir * add doc for the env var
gaoyz0625 · Dec 7, 2018 · 37feb47 · 37feb47
1 parent 3564fdc
commit 37feb47
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/conda/dgl/bld.bat b/conda/dgl/bld.bat
@@ -2,7 +2,7 @@ git submodule init
 git submodule update
 md build
 cd build
-cmake -DCMAKE_CXX_FLAGS="-DDMLC_LOG_STACK_TRACE=0 -DDGL_EXPORTS" -DCMAKE_MAKE_PROGRAM=mingw32-make .. -G "MSYS Makefiles"
+cmake -DCMAKE_CXX_FLAGS="-DDMLC_LOG_STACK_TRACE=0 -DDGL_EXPORTS" -DCMAKE_MAKE_PROGRAM=mingw32-make .. -G "MinGW Makefiles"
 if errorlevel 1 exit 1
 mingw32-make
 if errorlevel 1 exit 1

diff --git a/conda/dgl/meta.yaml b/conda/dgl/meta.yaml
@@ -1,15 +1,17 @@
 package:
   name: dgl
-  version: "0.1.0"
+  version: "0.1.2"
 
 source:
+  git_rev: 0.1.2
   git_url: https://github.com/jermainewang/dgl.git
 
 requirements:
   build:
     - python {{ python }}
     - setuptools
     - cmake
+    - git
     - m2w64-gcc         # [win]
     - m2w64-make        # [win]
   run:

diff --git a/docs/source/env_var.rst b/docs/source/env_var.rst
@@ -3,7 +3,7 @@ Environment Variables
 
 Backend Options
 ---------------
-* ``DGLBACKEND``
+* ``DGLBACKEND``:
     * Values: String (default='pytorch')
     * The backend deep lerarning framework for DGL.
     * Choices:
@@ -12,9 +12,12 @@ Backend Options
 
 Data Repository
 ---------------
-* ``DGL_REPO``
+* ``DGL_REPO``:
     * Values: String (default='https://s3.us-east-2.amazonaws.com/dgl.ai/')
     * The repository url to be used for DGL datasets and pre-trained models.
     * Suggested values:
         * 'https://s3.us-east-2.amazonaws.com/dgl.ai/': DGL repo for U.S.
         * 'https://s3-ap-southeast-1.amazonaws.com/dgl.ai.asia/': DGL repo for Asia
+* ``DGL_DOWNLOAD_DIR``:
+    * Values: String (default="${HOME}/.dgl")
+    * The local directory to cache the downloaded data.
diff --git a/include/dgl/runtime/c_runtime_api.h b/include/dgl/runtime/c_runtime_api.h
@@ -33,7 +33,7 @@
 #endif
 
 // DGL version
-#define DGL_VERSION "0.1.0"
+#define DGL_VERSION "0.1.2"
 
 
 // DGL Runtime is DLPack compatible.

diff --git a/python/dgl/_ffi/libinfo.py b/python/dgl/_ffi/libinfo.py
@@ -87,4 +87,4 @@ def find_lib_path(name=None, search_path=None, optional=False):
 # We use the version of the incoming release for code
 # that is under development.
 # The following line is set by dgl/python/update_version.py
-__version__ = "0.1.0"
+__version__ = "0.1.2"
diff --git a/python/dgl/data/utils.py b/python/dgl/data/utils.py
@@ -158,8 +158,8 @@ def get_download_dir():
     dirname : str
         Path to the download directory
     """
-    curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
-    dirname = os.path.join(curr_path, '../../../_download')
+    default_dir = os.path.join(os.path.expanduser('~'), '.dgl')
+    dirname = os.environ.get('DGL_DOWNLOAD_DIR', default_dir)
     if not os.path.exists(dirname):
         os.makedirs(dirname)
     return dirname
diff --git a/python/update_version.py b/python/update_version.py
@@ -11,7 +11,7 @@
 # current version
 # We use the version of the incoming release for code
 # that is under development
-__version__ = "0.1.0"
+__version__ = "0.1.2"
 
 # Implementations
 def update(file_name, pattern, repl):