From f10423296896aa50fdd21938f0889f6d59973924 Mon Sep 17 00:00:00 2001 From: tqchen Date: Sun, 24 Nov 2019 10:11:58 -0800 Subject: [PATCH] [LICENSE] clarify the blockingqueue license, update version to 0.6.0 --- LICENSE | 2 +- conda/tvm-libs/meta.yaml | 2 +- conda/tvm/meta.yaml | 2 +- include/tvm/runtime/c_runtime_api.h | 2 +- licenses/LICENSE.blockingconcurrentqueue.txt | 11 ++++++++++- python/tvm/_ffi/libinfo.py | 2 +- version.py | 2 +- web/tvm_runtime.js | 2 +- 8 files changed, 17 insertions(+), 8 deletions(-) diff --git a/LICENSE b/LICENSE index 4345a24d059b..49856917b215 100644 --- a/LICENSE +++ b/LICENSE @@ -224,7 +224,7 @@ BSD 2-clause License BSD 2-clause License + zlib License ----------------------------------- -3rdparty/dmlc-core/include/dmlc/concurrentqueue.h +3rdparty/dmlc-core/include/dmlc/blockingconcurrentqueue.h MIT License diff --git a/conda/tvm-libs/meta.yaml b/conda/tvm-libs/meta.yaml index faea61445f79..83e73a7de9ab 100644 --- a/conda/tvm-libs/meta.yaml +++ b/conda/tvm-libs/meta.yaml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -{% set version = "0.6.dev1" %} +{% set version = "0.6.0" %} package: name: tvm-libs diff --git a/conda/tvm/meta.yaml b/conda/tvm/meta.yaml index fe4752e321ef..12f9a9698d70 100644 --- a/conda/tvm/meta.yaml +++ b/conda/tvm/meta.yaml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -{% set version = "0.6.dev1" %} +{% set version = "0.6.0" %} package: name: tvm diff --git a/include/tvm/runtime/c_runtime_api.h b/include/tvm/runtime/c_runtime_api.h index 267504beb11a..5053326058bc 100644 --- a/include/tvm/runtime/c_runtime_api.h +++ b/include/tvm/runtime/c_runtime_api.h @@ -61,7 +61,7 @@ #endif // TVM version -#define TVM_VERSION "0.6.dev" +#define TVM_VERSION "0.6.0" // TVM Runtime is DLPack compatible. diff --git a/licenses/LICENSE.blockingconcurrentqueue.txt b/licenses/LICENSE.blockingconcurrentqueue.txt index 1cc22c47f9d5..d08e53a3c518 100644 --- a/licenses/LICENSE.blockingconcurrentqueue.txt +++ b/licenses/LICENSE.blockingconcurrentqueue.txt @@ -1,3 +1,12 @@ +©2015-2016 Cameron Desrochers. Distributed under the terms of the simplified +BSD license, available at the top of concurrentqueue.h. + +Uses Jeff Preshing's semaphore implementation (under the terms of its +separate zlib license, embedded below). + + +zlib license +------------ Copyright (c) 2015 Jeff Preshing This software is provided 'as-is', without any express or implied @@ -14,4 +23,4 @@ freely, subject to the following restrictions: appreciated but is not required. 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. \ No newline at end of file +3. This notice may not be removed or altered from any source distribution. diff --git a/python/tvm/_ffi/libinfo.py b/python/tvm/_ffi/libinfo.py index 851a41a3ef28..f1ca89409821 100644 --- a/python/tvm/_ffi/libinfo.py +++ b/python/tvm/_ffi/libinfo.py @@ -202,4 +202,4 @@ def find_include_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 tvm/python/update_version.py -__version__ = "0.6.dev" +__version__ = "0.6.0" diff --git a/version.py b/version.py index c949d5c2ead2..aa20810a2069 100644 --- a/version.py +++ b/version.py @@ -31,7 +31,7 @@ # current version # We use the version of the incoming release for code # that is under development -__version__ = "0.6.dev" +__version__ = "0.6.0" # Implementations def update(file_name, pattern, repl): diff --git a/web/tvm_runtime.js b/web/tvm_runtime.js index 2c36b9eb277d..c90587823c9d 100644 --- a/web/tvm_runtime.js +++ b/web/tvm_runtime.js @@ -21,7 +21,7 @@ * TVM Javascript web runtime library. * * @projectname tvm - * @version 0.6.dev + * @version 0.6.0 */ /* eslint no-unused-vars: "off" */ /* eslint no-unexpected-multiline: "off" */