Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
e3658042
Unverified
Commit
e3658042
authored
Jun 06, 2020
by
Rémi Verschelde
Committed by
GitHub
Jun 06, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #39346 from akien-mga/oidn-fix-vs-2017
oidn: Fix build for VS 2017
parents
ca5519c4
38a200f1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
53 additions
and
8 deletions
+53
-8
COPYRIGHT.txt
COPYRIGHT.txt
+1
-1
README.md
thirdparty/README.md
+3
-3
rnn_reorders.hpp
thirdparty/oidn/mkl-dnn/src/cpu/rnn/rnn_reorders.hpp
+1
-1
simple_concat.hpp
thirdparty/oidn/mkl-dnn/src/cpu/simple_concat.hpp
+3
-3
godot-changes-c58c5216.patch
thirdparty/oidn/patches/godot-changes-c58c5216.patch
+0
-0
mkl-dnn-fix-vs2017-build.patch
thirdparty/oidn/patches/mkl-dnn-fix-vs2017-build.patch
+45
-0
No files found.
COPYRIGHT.txt
View file @
e3658042
...
...
@@ -299,7 +299,7 @@ License: Zlib
Files: ./thirdparty/oidn/
Comment: Intel Open Image Denoise
Copyright: 2009-20
20
, Intel Corporation
Copyright: 2009-20
19
, Intel Corporation
License: Apache-2.0
Files: ./thirdparty/opus/
...
...
thirdparty/README.md
View file @
e3658042
...
...
@@ -446,7 +446,7 @@ Files extracted from the upstream source:
## oidn
-
Upstream: https://github.com/OpenImageDenoise/oidn
-
Version: 1.1.0 (c58c5216db05ceef4cde5a096862f2eeffd14c06)
-
Version: 1.1.0 (c58c5216db05ceef4cde5a096862f2eeffd14c06
, 2019
)
-
License: Apache 2.0
Files extracted from upstream source:
...
...
@@ -461,8 +461,8 @@ weights/rtlightmap_hdr.tza
scripts/resource_to_cpp.py
Modified files:
Modifications are marked with
`// -- GODOT start --`
and
`// -- GODOT end --`
A patch file is provided in
`oidn/godot-changes-c58c5216.patch`
Modifications are marked with
`// -- GODOT start --`
and
`// -- GODOT end --`
.
Patch files are provided in
`oidn/patches/`
.
core/autoencoder.cpp
core/autoencoder.h
...
...
thirdparty/oidn/mkl-dnn/src/cpu/rnn/rnn_reorders.hpp
View file @
e3658042
...
...
@@ -131,7 +131,7 @@ struct rnn_weights_reorder_t : public cpu_primitive_t {
return
status
::
success
;
}
format_tag_t
itag_
;
format_tag_t
itag_
=
mkldnn_format_tag_undef
;
private
:
void
init_scratchpad
()
{
...
...
thirdparty/oidn/mkl-dnn/src/cpu/simple_concat.hpp
View file @
e3658042
...
...
@@ -96,9 +96,9 @@ struct simple_concat_t: public cpu_primitive_t {
return
status
::
success
;
}
int
perm_
[
MKLDNN_MAX_NDIMS
];
int
iperm_
[
MKLDNN_MAX_NDIMS
];
dims_t
blocks_
;
int
perm_
[
MKLDNN_MAX_NDIMS
]
{}
;
int
iperm_
[
MKLDNN_MAX_NDIMS
]
{}
;
dims_t
blocks_
{}
;
dim_t
nelems_to_concat
(
const
memory_desc_wrapper
&
data_d
)
const
{
const
int
ndims
=
data_d
.
ndims
();
...
...
thirdparty/oidn/godot-changes-c58c5216.patch
→
thirdparty/oidn/
patches/
godot-changes-c58c5216.patch
View file @
e3658042
File moved
thirdparty/oidn/patches/mkl-dnn-fix-vs2017-build.patch
0 → 100644
View file @
e3658042
Rediffed by @akien-mga to match oidn 1.1.0 source.
From 1e42e6db81e1a5270ecc0191c5385ce7e7d978e9 Mon Sep 17 00:00:00 2001
From: Jeremy Wong <jmw@netvigator.com>
Date: Wed, 11 Sep 2019 04:46:53 +0800
Subject: [PATCH] src: initialize members in some structures to prevent compile
errors with VS2017
addresses "error C3615: constexpr function '...' cannot result in a constant expression" with VS2017
---
src/cpu/rnn/rnn_reorders.hpp | 2 +-
src/cpu/simple_concat.hpp | 6 +++---
src/cpu/simple_sum.hpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/thirdparty/oidn/mkl-dnn/src/cpu/rnn/rnn_reorders.hpp b/thirdparty/oidn/mkl-dnn/src/cpu/rnn/rnn_reorders.hpp
index 597c63e3f8..ae1551390a 100644
--- a/thirdparty/oidn/mkl-dnn/src/cpu/rnn/rnn_reorders.hpp
+++ b/thirdparty/oidn/mkl-dnn/src/cpu/rnn/rnn_reorders.hpp
@@ -131,7 +131,7 @@ struct rnn_weights_reorder_t : public cpu_primitive_t {
return status::success;
}
- format_tag_t itag_;
+ format_tag_t itag_ = mkldnn_format_tag_undef;
private:
void init_scratchpad() {
diff --git a/thirdparty/oidn/mkl-dnn/src/cpu/simple_concat.hpp b/thirdparty/oidn/mkl-dnn/src/cpu/simple_concat.hpp
index 5177275452..057cc3c4c7 100644
--- a/thirdparty/oidn/mkl-dnn/src/cpu/simple_concat.hpp
+++ b/thirdparty/oidn/mkl-dnn/src/cpu/simple_concat.hpp
@@ -96,9 +96,9 @@ struct simple_concat_t: public cpu_primitive_t {
return status::success;
}
- int perm_[MKLDNN_MAX_NDIMS];
- int iperm_[MKLDNN_MAX_NDIMS];
- dims_t blocks_;
+ int perm_[MKLDNN_MAX_NDIMS] {};
+ int iperm_[MKLDNN_MAX_NDIMS] {};
+ dims_t blocks_ {};
dim_t nelems_to_concat(const memory_desc_wrapper &data_d) const {
const int ndims = data_d.ndims();
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment