Skip to content
This repository has been archived by the owner on Jun 4, 2021. It is now read-only.

Commit

Permalink
Update to 0.3.0 (#1)
Browse files Browse the repository at this point in the history
  • Loading branch information
fs-eire authored Mar 23, 2019
1 parent 187ecf1 commit d6040e5
Show file tree
Hide file tree
Showing 71 changed files with 234 additions and 6,260 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ target_link_libraries(onnxruntime PRIVATE ${CMAKE_JS_LIB})
if (WIN32)
target_link_libraries(onnxruntime PRIVATE ${CMAKE_SOURCE_DIR}/onnxruntime/bin/win-x64/onnxruntime.lib)
elseif (APPLE)
target_link_libraries(onnxruntime PRIVATE ${CMAKE_SOURCE_DIR}/onnxruntime/bin/darwin-x64/libonnxruntime.0.2.1.dylib)
target_link_libraries(onnxruntime PRIVATE ${CMAKE_SOURCE_DIR}/onnxruntime/bin/darwin-x64/libonnxruntime.0.3.0.dylib)
set_target_properties(onnxruntime PROPERTIES INSTALL_RPATH "@loader_path")
else()
target_link_libraries(onnxruntime PRIVATE ${CMAKE_SOURCE_DIR}/onnxruntime/bin/linux-x64/libonnxruntime.so.0.2.1)
target_link_libraries(onnxruntime PRIVATE ${CMAKE_SOURCE_DIR}/onnxruntime/bin/linux-x64/libonnxruntime.so.0.3.0)
set_target_properties(onnxruntime PROPERTIES INSTALL_RPATH "$ORIGIN/")
endif()

Expand All @@ -42,7 +42,7 @@ if (NOT APPLE)
if (WIN32)
target_link_libraries(onnxruntime_gpu PRIVATE ${CMAKE_SOURCE_DIR}/onnxruntime/bin/win_gpu-x64/onnxruntime.lib)
else()
target_link_libraries(onnxruntime_gpu PRIVATE ${CMAKE_SOURCE_DIR}/onnxruntime/bin/linux_gpu-x64/libonnxruntime.so.0.2.1)
target_link_libraries(onnxruntime_gpu PRIVATE ${CMAKE_SOURCE_DIR}/onnxruntime/bin/linux_gpu-x64/libonnxruntime.so.0.3.0)
set_target_properties(onnxruntime_gpu PROPERTIES INSTALL_RPATH "$ORIGIN/")
endif()
endif()
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ npm install onnxjs-node
## Supported Platforms
OS |Arch |CPU/GPU |NAPI version |ONNXRuntime version
---------|-----|--------|-------------|--------------------
Windows | x64 | CPU | v3 | v0.2.1
Linux | x64 | CPU | v3 | v0.2.1
macOS | x64 | CPU | v3 | v0.2.1
Windows | x64 | GPU | v3 | v0.2.1
Linux | x64 | GPU | v3 | v0.2.1
Windows | x64 | CPU | v3 | v0.3.0
Linux | x64 | CPU | v3 | v0.3.0
macOS | x64 | CPU | v3 | v0.3.0
Windows | x64 | GPU | v3 | v0.3.0
Linux | x64 | GPU | v3 | v0.3.0

## Usage
There are 2 options to import `onnxjs-node`.
Expand Down Expand Up @@ -54,6 +54,8 @@ session = new onnx.InferenceSession({backendHint: 'wasm'}); // use WebAssembly
## Documentation
- [ONNX.js Home](https://github.com/Microsoft/onnxjs)
- [ONNXRuntime](https://github.com/Microsoft/onnxruntime)
- [Nuget package: Microsoft.ML.OnnxRuntime](https://www.nuget.org/packages/Microsoft.ML.OnnxRuntime/)
- [Nuget package: Microsoft.ML.OnnxRuntime.Gpu](https://www.nuget.org/packages/Microsoft.ML.OnnxRuntime.Gpu/)

# License
Copyright (c) fs-eire. All rights reserved.
Expand Down
130 changes: 0 additions & 130 deletions onnxruntime/README.md

This file was deleted.

133 changes: 26 additions & 107 deletions onnxruntime/ThirdPartyNotices.txt
Original file line number Diff line number Diff line change
Expand Up @@ -205,38 +205,6 @@ external contributions to this project including patches, pull requests, etc.

_____

NVlabs/cub

Copyright (c) 2010-2011, Duane Merrill. All rights reserved.
Copyright (c) 2011-2018, NVIDIA CORPORATION. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

* Neither the name of the NVIDIA CORPORATION nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

_____

onnx
Open Neural Network Exchange

Expand Down Expand Up @@ -1913,35 +1881,9 @@ DLPack: Open In Memory Tensor Structure
See the License for the specific language governing permissions and
limitations under the License.

_____

JSON for Modern C++

MIT License

Copyright (c) 2013-2018 Niels Lohmann

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

____

Date
HowardHinnant/date

The source code in this project is released using the MIT License. There is no
global license for the project because each file is licensed individually with
Expand Down Expand Up @@ -2815,55 +2757,32 @@ Apache License

_____

dotnet/corefxlab

The MIT License (MIT)

Copyright (c) .NET Foundation and Contributors

All rights reserved.
google/re2

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Copyright (c) 2009 The RE2 Authors. All rights reserved.

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

_____

dotnet/standard

The MIT License (MIT)

Copyright (c) .NET Foundation and Contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Binary file not shown.
Binary file removed onnxruntime/bin/linux-x64/libmkldnn.so.0
Binary file not shown.
Binary file not shown.
Binary file removed onnxruntime/bin/linux_gpu-x64/libmkldnn.so.0
Binary file not shown.
Binary file not shown.
Binary file removed onnxruntime/bin/win-x64/mkldnn.dll
Binary file not shown.
Binary file modified onnxruntime/bin/win-x64/onnxruntime.dll
Binary file not shown.
Binary file modified onnxruntime/bin/win-x64/onnxruntime.lib
Binary file not shown.
Binary file removed onnxruntime/bin/win_gpu-x64/mkldnn.dll
Binary file not shown.
Binary file modified onnxruntime/bin/win_gpu-x64/onnxruntime.dll
Binary file not shown.
Binary file modified onnxruntime/bin/win_gpu-x64/onnxruntime.lib
Binary file not shown.
57 changes: 0 additions & 57 deletions onnxruntime/inc/core/common/code_location.h

This file was deleted.

Loading

0 comments on commit d6040e5

Please sign in to comment.