Skip to content

Commit

Permalink
Change MPL-2.0 to Apache-2.0
Browse files Browse the repository at this point in the history
Signed-off-by: Dhruv Govil <[email protected]>
  • Loading branch information
dgovil authored and danrbailey committed Oct 9, 2024
1 parent 934c336 commit 453fa6f
Show file tree
Hide file tree
Showing 768 changed files with 1,475 additions and 2,313 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[

Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ open source software best practice policies of the Linux Foundation.

#### License

OpenVDB is licensed under the [Mozilla Public License, version 2.0](LICENSE.md)
OpenVDB is licensed under the [Apache License, version 2.0](LICENSE.md)
license. Contributions to OpenVDB should abide by that standard
license.

Expand Down Expand Up @@ -54,7 +54,7 @@ Every commit must be signed off. That is, every commit log message
must include a “`Signed-off-by`” line (generated, for example, with
`git commit --signoff`”), indicating that the committer wrote the
code and has the right to release it under the
[Mozilla Public License, version 2.0](LICENSE.md)
[Apache License, version 2.0](LICENSE.md)
license. See the [TAC documentation on contribution sign off](https://github.com/AcademySoftwareFoundation/tac/blob/master/process/contributing.md#contribution-sign-off) for more information on this requirement.

## Maintainer
Expand Down
549 changes: 176 additions & 373 deletions LICENSE

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[Discussion Forum](https://github.com/AcademySoftwareFoundation/openvdb/discussions) |
[Documentation](https://www.openvdb.org/documentation/doxygen) |
[Releases](https://github.com/AcademySoftwareFoundation/openvdb/releases) |
[License](https://www.mozilla.org/MPL/2.0) |
[License](https://www.apache.org/licenses/LICENSE-2.0) |
[Slack](https://slack.aswf.io/)

OpenVDB is an open source C++ library comprising a novel hierarchical data
Expand All @@ -28,14 +28,14 @@ generally less stable than the [production releases](https://github.com/AcademyS

### License

OpenVDB is released under the [Mozilla Public License Version 2.0](https://www.mozilla.org/MPL/2.0/),
OpenVDB is released under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0),
which is a free, open source software license developed and maintained by the
Mozilla Foundation.
Apache Software Foundation.

The trademarks of any contributor to this project may not be used in
association with the project without the contributor's express permission.

NOTE: OpenVDB is in the process of changing its license from [Mozilla Public License Version 2.0](https://www.mozilla.org/MPL/2.0/) to [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0)! Please see the file RE-LICENSE_NOTE.txt for more details.
NOTE: OpenVDB has completed re-licensing from [Mozilla Public License Version 2.0](https://www.mozilla.org/MPL/2.0/) to [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0). Please see the file RE-LICENSE_NOTE.txt for more details.

### Contributing

Expand Down
2 changes: 1 addition & 1 deletion ci/download_houdini.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
#
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
# Python script to download the latest Houdini builds
# using the SideFX download API:
Expand Down
2 changes: 1 addition & 1 deletion cmake/FindBlosc.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[.rst:

Expand Down
2 changes: 1 addition & 1 deletion cmake/FindCppUnit.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[.rst:

Expand Down
2 changes: 1 addition & 1 deletion cmake/FindJemalloc.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[.rst:

Expand Down
2 changes: 1 addition & 1 deletion cmake/FindLog4cplus.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[.rst:

Expand Down
2 changes: 1 addition & 1 deletion cmake/FindOpenEXR.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[.rst:

Expand Down
2 changes: 1 addition & 1 deletion cmake/FindOpenVDB.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[.rst:

Expand Down
2 changes: 1 addition & 1 deletion cmake/FindTBB.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[.rst:

Expand Down
2 changes: 1 addition & 1 deletion cmake/OpenVDBGLFW3Setup.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[.rst:

Expand Down
2 changes: 1 addition & 1 deletion cmake/OpenVDBHoudiniSetup.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[.rst:

Expand Down
2 changes: 1 addition & 1 deletion cmake/OpenVDBMayaSetup.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[.rst:

Expand Down
2 changes: 1 addition & 1 deletion cmake/OpenVDBUtils.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[.rst:

Expand Down
2 changes: 1 addition & 1 deletion cmake/Uninstall.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[.rst:

Expand Down
2 changes: 1 addition & 1 deletion cmake/config/OpenVDBCXX.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[

Expand Down
2 changes: 1 addition & 1 deletion cmake/config/OpenVDBVersions.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[

Expand Down
2 changes: 1 addition & 1 deletion doc/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[

Expand Down
8 changes: 4 additions & 4 deletions doc/faq.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ details of VDB are described in the paper
<a href="http://www.museth.org/Ken/Publications.html" target="_blank">"VDB: High-Resolution Sparse Volumes with Dynamic Topology"</a>.

@section sWhatLicense What license is OpenVDB distributed under?
OpenVDB is released under the Mozilla Public License Version 2.0, which is a
free, open source software license developed and maintained by the Mozilla
Foundation. For more information about this license, see the
<a href="https://www.mozilla.org/en-US/MPL/" target="_blank">Mozilla FAQ</a>.
OpenVDB is released under the Apache License Version 2.0, which is a
free, open source software license developed and maintained by the Apache Software
Foundation. For more information about this license, see
<a href="https://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License, Version 2</a>.

@section sWhatCLA Is there a Contributor License Agreement for OpenVDB?
Yes, developers who wish to contribute code to be considered for inclusion
Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[

Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/CNanoVDB.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

//
// Simple C-wrapper for the nanovdb structure
Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/GridHandle.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

/*!
\file nanovdb/GridHandle.h
Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/HostBuffer.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

/*!
@file nanovdb/HostBuffer.h
Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/NanoVDB.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

/*!
\file nanovdb/NanoVDB.h
Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/NodeManager.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

/*!
\file nanovdb/NodeManager.h
Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/PNanoVDB.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

/*!
\file nanovdb/PNanoVDB.h
Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ A lightweight GPU friendly version of VDB initially targeting rendering applicat
* [Examples](../../doc/nanovdb/HelloWorld.md)

### Copyright Contributors to the OpenVDB Project
### SPDX-License-Identifier: MPL-2.0
### SPDX-License-Identifier: Apache-2.0

[![CircleCI](https://circleci.com/gh/NVIDIA-Omniverse/NanoVDB.svg?style=svg&circle-token=6c3b9bb166841033a0e0c1a9ee5ac49f73d89152)](https://circleci.com/gh/NVIDIA-Omniverse/NanoVDB)
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/cmd/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[

Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/cmd/convert/nanovdb_convert.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

/*!
\file nanovdb_convert.cc
Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/cmd/print/nanovdb_print.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

/*!
\file nanovdb_print.cc
Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/cmd/validate/nanovdb_validate.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

/*!
\file nanovdb_validate.cc
Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/cuda/DeviceBuffer.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

/*!
\file DeviceBuffer.h
Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/cuda/GridHandle.cuh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

/*!
\file nanovdb/cuda/GridHandle.cuh
Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/cuda/NodeManager.cuh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

/*!
\file nanovdb/cuda/NodeManager.cuh
Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the OpenVDB Project
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: Apache-2.0
#
#[=======================================================================[

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

#include <nanovdb/tools/CreatePrimitives.h>
#include <nanovdb/io/IO.h>
Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/examples/ex_collide_level_set/common.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/examples/ex_collide_level_set/main.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

#include <algorithm>
#include <iostream>
Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/examples/ex_collide_level_set/nanovdb.cu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

#define _USE_MATH_DEFINES
#include <cmath>
Expand Down
2 changes: 1 addition & 1 deletion nanovdb/nanovdb/examples/ex_collide_level_set/openvdb.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

#if defined(NANOVDB_USE_OPENVDB)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

#include <nanovdb/tools/CreateNanoGrid.h>
#include <nanovdb/tools/CreatePrimitives.h>// for nanovdb::tools::createLevelSetSphere
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

#include <nanovdb/NanoVDB.h> // this defined the core tree data structure of NanoVDB accessable on both the host and device
#include <nanovdb/cuda/GridHandle.cuh>// required since GridHandle<DeviceBuffer> has device code
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

#include <nanovdb/tools/GridBuilder.h>
#include <nanovdb/tools/CreateNanoGrid.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

#undef NANOVDB_USE_OPENVDB // Prevents include/openvdb/points/AttributeArray.h:1841:25: error: ‘stride’ cannot be used as a function

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

#include <nanovdb/NanoVDB.h> // this defined the core tree data structure of NanoVDB accessable on both the host and device
#include <nanovdb/cuda/GridHandle.cuh>// required since GridHandle<DeviceBuffer> has device code
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

#include <nanovdb/tools/GridBuilder.h>
#include <nanovdb/tools/CreateNanoGrid.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

#include <nanovdb/tools/CreatePrimitives.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

#include <nanovdb/tools/GridBuilder.h>
#include <nanovdb/tools/CreateNanoGrid.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

#include <nanovdb/tools/CreatePrimitives.h>
#include <nanovdb/io/IO.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenVDB Project
// SPDX-License-Identifier: MPL-2.0
// SPDX-License-Identifier: Apache-2.0

/// @brief This examples demonstrates how values in a NanpVDB grid can be
/// modified on the device. It depends on NanoVDB and CUDA thrust.
Expand Down
Loading

0 comments on commit 453fa6f

Please sign in to comment.