Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[LICENSE] clarify the blockingqueue license, update version to 0.6.0 #4414

Merged
merged 1 commit into from
Nov 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/tvm-libs/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/tvm/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/tvm/runtime/c_runtime_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#endif

// TVM version
#define TVM_VERSION "0.6.dev"
#define TVM_VERSION "0.6.0"


// TVM Runtime is DLPack compatible.
Expand Down
11 changes: 10 additions & 1 deletion licenses/LICENSE.blockingconcurrentqueue.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.
3. This notice may not be removed or altered from any source distribution.
2 changes: 1 addition & 1 deletion python/tvm/_ffi/libinfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion web/tvm_runtime.js
Original file line number Diff line number Diff line change
Expand Up @@ -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" */
Expand Down