Unverified Commit 059b1a6d authored by Quan (Andy) Gan's avatar Quan (Andy) Gan Committed by GitHub
Browse files

[Release] Bump up version (#636)

* bump up version

* conda+cuda trial

* switch conda branch

* revert

* disable cudnn
parent 94ecb8eb
...@@ -52,9 +52,9 @@ macro(find_cuda use_cuda) ...@@ -52,9 +52,9 @@ macro(find_cuda use_cuda)
PATHS ${CUDA_TOOLKIT_ROOT_DIR} PATHS ${CUDA_TOOLKIT_ROOT_DIR}
PATH_SUFFIXES lib lib64 targets/x86_64-linux/lib targets/x86_64-linux/lib/stubs lib64/stubs lib/x86_64-linux-gnu PATH_SUFFIXES lib lib64 targets/x86_64-linux/lib targets/x86_64-linux/lib/stubs lib64/stubs lib/x86_64-linux-gnu
NO_DEFAULT_PATH) NO_DEFAULT_PATH)
find_library(CUDA_CUDNN_LIBRARY cudnn #find_library(CUDA_CUDNN_LIBRARY cudnn
${CUDA_TOOLKIT_ROOT_DIR}/lib64 # ${CUDA_TOOLKIT_ROOT_DIR}/lib64
${CUDA_TOOLKIT_ROOT_DIR}/lib) # ${CUDA_TOOLKIT_ROOT_DIR}/lib)
find_library(CUDA_CUBLAS_LIBRARY cublas find_library(CUDA_CUBLAS_LIBRARY cublas
${CUDA_TOOLKIT_ROOT_DIR}/lib64 ${CUDA_TOOLKIT_ROOT_DIR}/lib64
${CUDA_TOOLKIT_ROOT_DIR}/lib) ${CUDA_TOOLKIT_ROOT_DIR}/lib)
...@@ -63,7 +63,7 @@ macro(find_cuda use_cuda) ...@@ -63,7 +63,7 @@ macro(find_cuda use_cuda)
message(STATUS "Found CUDA_CUDA_LIBRARY=" ${CUDA_CUDA_LIBRARY}) message(STATUS "Found CUDA_CUDA_LIBRARY=" ${CUDA_CUDA_LIBRARY})
message(STATUS "Found CUDA_CUDART_LIBRARY=" ${CUDA_CUDART_LIBRARY}) message(STATUS "Found CUDA_CUDART_LIBRARY=" ${CUDA_CUDART_LIBRARY})
message(STATUS "Found CUDA_NVRTC_LIBRARY=" ${CUDA_NVRTC_LIBRARY}) message(STATUS "Found CUDA_NVRTC_LIBRARY=" ${CUDA_NVRTC_LIBRARY})
message(STATUS "Found CUDA_CUDNN_LIBRARY=" ${CUDA_CUDNN_LIBRARY}) #message(STATUS "Found CUDA_CUDNN_LIBRARY=" ${CUDA_CUDNN_LIBRARY})
message(STATUS "Found CUDA_CUBLAS_LIBRARY=" ${CUDA_CUBLAS_LIBRARY}) message(STATUS "Found CUDA_CUBLAS_LIBRARY=" ${CUDA_CUBLAS_LIBRARY})
endif(CUDA_FOUND) endif(CUDA_FOUND)
endmacro(find_cuda) endmacro(find_cuda)
...@@ -3,7 +3,7 @@ git submodule init ...@@ -3,7 +3,7 @@ git submodule init
git submodule update git submodule update
md build md build
cd build cd build
cmake -DCMAKE_CXX_FLAGS="/DDGL_EXPORTS" -DCMAKE_CONFIGURATION_TYPES="Release" .. -G "Visual Studio 15 2017 Win64" || EXIT /B 1 cmake -DUSE_CUDA=%USE_CUDA% -DUSE_OPENMP=ON -DCMAKE_CXX_FLAGS="/DDGL_EXPORTS" -DCMAKE_CONFIGURATION_TYPES="Release" .. -G "Visual Studio 15 2017 Win64" || EXIT /B 1
msbuild dgl.sln || EXIT /B 1 msbuild dgl.sln || EXIT /B 1
COPY Release\dgl.dll . COPY Release\dgl.dll .
cd ..\python cd ..\python
......
...@@ -2,7 +2,7 @@ git submodule init ...@@ -2,7 +2,7 @@ git submodule init
git submodule update git submodule update
mkdir build mkdir build
cd build cd build
cmake .. cmake -DUSE_CUDA=$USE_CUDA -DUSE_OPENMP=ON -DCUDA_ARCH_NAME=All ..
make make
cd ../python cd ../python
$PYTHON setup.py install --single-version-externally-managed --record=record.txt $PYTHON setup.py install --single-version-externally-managed --record=record.txt
package: package:
name: dgl name: dgl{{ environ.get('DGL_PACKAGE_SUFFIX') }}
version: "0.2" version: "0.3"
source: source:
git_rev: 0.2.x git_rev: 0.3.x
git_url: https://github.com/dmlc/dgl.git git_url: https://github.com/dmlc/dgl.git
requirements: requirements:
...@@ -19,6 +19,10 @@ requirements: ...@@ -19,6 +19,10 @@ requirements:
- scipy - scipy
- networkx - networkx
build:
script_env:
- USE_CUDA
about: about:
home: https://github.com/dmlc/dgl.git home: https://github.com/dmlc/dgl.git
license_file: ../../LICENSE license_file: ../../LICENSE
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#endif #endif
// DGL version // DGL version
#define DGL_VERSION "0.2" #define DGL_VERSION "0.3"
// DGL Runtime is DLPack compatible. // DGL Runtime is DLPack compatible.
......
...@@ -87,4 +87,4 @@ def find_lib_path(name=None, search_path=None, optional=False): ...@@ -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 # We use the version of the incoming release for code
# that is under development. # that is under development.
# The following line is set by dgl/python/update_version.py # The following line is set by dgl/python/update_version.py
__version__ = "0.2" __version__ = "0.3"
...@@ -11,7 +11,7 @@ import re ...@@ -11,7 +11,7 @@ import re
# current version # current version
# We use the version of the incoming release for code # We use the version of the incoming release for code
# that is under development # that is under development
__version__ = "0.2" __version__ = "0.3"
# Implementations # Implementations
def update(file_name, pattern, repl): def update(file_name, pattern, repl):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment