Skip to content

Commit bab2f41

Browse files
dietzcdietzc
committed
Merge branch 'rc_1.0.0'
2 parents a39e1c8 + 2a854a0 commit bab2f41

File tree

10 files changed

+937
-4
lines changed

10 files changed

+937
-4
lines changed

‎org.knime.knip.dl4j.feature/feature.xml

+7-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
provider-name="University of Konstanz, Germany">
77

88
<description>
9-
KNIME Image Processing - Deeplearning4J Integration.
9+
KNIME Image Processing - Deeplearning4J Integration.
1010
Contains additional nodes used in the context
1111
of image processing.
1212
</description>
@@ -16,7 +16,7 @@ of image processing.
1616
</copyright>
1717

1818
<license>
19-
GNU GENERAL PUBLIC LICENSE with Additional Permissions according to Sec. 7
19+
GNU GENERAL PUBLIC LICENSE with Additional Permissions according to Sec. 7
2020
*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
2121
Please see below the General Public License (GPL), Version 3,
2222
and the Additional Permissions according to Sec. 7
@@ -727,7 +727,11 @@ Nodes, in each case even if such Nodes are propagated with or for
727727
interoperation with KNIME. The owner of a Node may freely choose the
728728
license terms applicable to such Node, including when such Node is
729729
propagated with or for interoperation with KNIME.
730-
</license>
730+
</license>
731+
732+
<includes
733+
id="org.knime.features.ext.dl4j"
734+
version="0.0.0"/>
731735

732736
<plugin
733737
id="org.knime.knip.dl4j"

‎org.knime.knip.dl4j.testing.feature/.project

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.knime.knip.dl4j.testing.feature</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.pde.FeatureBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.pde.FeatureNature</nature>
16+
</natures>
17+
</projectDescription>

‎org.knime.knip.dl4j.testing.feature/build.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bin.includes = feature.xml

‎org.knime.knip.dl4j.testing.feature/feature.xml

+739
Large diffs are not rendered by default.

‎org.knime.knip.dl4j.update/feature.xml

+4
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@
99
id="org.knime.knip.dl4j.feature"
1010
version="0.0.0"/>
1111

12+
<includes
13+
id="org.knime.knip.dl4j.testing.feature"
14+
version="0.0.0"/>
15+
1216
</feature>

‎org.knime.knip.dl4j/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ Require-Bundle: org.knime.knip.base;bundle-version="[1.5.0,2.0.0)",
1111
org.knime.core;bundle-version="3.2.0",
1212
org.knime.ext.dl4j.base;bundle-version="3.2.0",
1313
org.knime.ext.dl4j.libs;bundle-version="0.4.310"
14-
Bundle-Vendor: KNIME GmbH, Konstanz, Germany
14+
Bundle-Vendor: University of Konstanz, Germany

‎org.knime.knip.dl4j/src/org/knime/knip/dl4j/data/convert/ImgPlusValueToINDArrayConverterFactory.java

+42
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
/*******************************************************************************
2+
* Copyright by KNIME GmbH, Konstanz, Germany
3+
* Website: http://www.knime.org; Email: [email protected]
4+
*
5+
* This program is free software; you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License, Version 3, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This program is distributed in the hope that it will be useful, but
10+
* WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License
15+
* along with this program; if not, see <http://www.gnu.org/licenses>.
16+
*
17+
* Additional permission under GNU GPL version 3 section 7:
18+
*
19+
* KNIME interoperates with ECLIPSE solely via ECLIPSE's plug-in APIs.
20+
* Hence, KNIME and ECLIPSE are both independent programs and are not
21+
* derived from each other. Should, however, the interpretation of the
22+
* GNU GPL Version 3 ("License") under any applicable laws result in
23+
* KNIME and ECLIPSE being a combined program, KNIME GMBH herewith grants
24+
* you the additional permission to use and propagate KNIME together with
25+
* ECLIPSE with only the license terms in place for ECLIPSE applying to
26+
* ECLIPSE and the GNU GPL Version 3 applying for KNIME, provided the
27+
* license terms of ECLIPSE themselves allow for the respective use and
28+
* propagation of ECLIPSE together with KNIME.
29+
*
30+
* Additional permission relating to nodes for KNIME that extend the Node
31+
* Extension (and in particular that are based on subclasses of NodeModel,
32+
* NodeDialog, and NodeView) and that only interoperate with KNIME through
33+
* standard APIs ("Nodes"):
34+
* Nodes are deemed to be separate and independent programs and to not be
35+
* covered works. Notwithstanding anything to the contrary in the
36+
* License, the License does not apply to Nodes, you are not required to
37+
* license Nodes under the License, and you are granted a license to
38+
* prepare and propagate Nodes, in each case even if such Nodes are
39+
* propagated with or for interoperation with KNIME. The owner of a Node
40+
* may freely choose the license terms applicable to such Node, including
41+
* when such Node is propagated with or for interoperation with KNIME.
42+
*******************************************************************************/
143
package org.knime.knip.dl4j.data.convert;
244

345
import java.util.Iterator;

‎org.knime.knip.dl4j/src/org/knime/knip/dl4j/node/data/mnist/MnistFetcherNodeDialog.java

+42
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
/*******************************************************************************
2+
* Copyright by KNIME GmbH, Konstanz, Germany
3+
* Website: http://www.knime.org; Email: [email protected]
4+
*
5+
* This program is free software; you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License, Version 3, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This program is distributed in the hope that it will be useful, but
10+
* WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License
15+
* along with this program; if not, see <http://www.gnu.org/licenses>.
16+
*
17+
* Additional permission under GNU GPL version 3 section 7:
18+
*
19+
* KNIME interoperates with ECLIPSE solely via ECLIPSE's plug-in APIs.
20+
* Hence, KNIME and ECLIPSE are both independent programs and are not
21+
* derived from each other. Should, however, the interpretation of the
22+
* GNU GPL Version 3 ("License") under any applicable laws result in
23+
* KNIME and ECLIPSE being a combined program, KNIME GMBH herewith grants
24+
* you the additional permission to use and propagate KNIME together with
25+
* ECLIPSE with only the license terms in place for ECLIPSE applying to
26+
* ECLIPSE and the GNU GPL Version 3 applying for KNIME, provided the
27+
* license terms of ECLIPSE themselves allow for the respective use and
28+
* propagation of ECLIPSE together with KNIME.
29+
*
30+
* Additional permission relating to nodes for KNIME that extend the Node
31+
* Extension (and in particular that are based on subclasses of NodeModel,
32+
* NodeDialog, and NodeView) and that only interoperate with KNIME through
33+
* standard APIs ("Nodes"):
34+
* Nodes are deemed to be separate and independent programs and to not be
35+
* covered works. Notwithstanding anything to the contrary in the
36+
* License, the License does not apply to Nodes, you are not required to
37+
* license Nodes under the License, and you are granted a license to
38+
* prepare and propagate Nodes, in each case even if such Nodes are
39+
* propagated with or for interoperation with KNIME. The owner of a Node
40+
* may freely choose the license terms applicable to such Node, including
41+
* when such Node is propagated with or for interoperation with KNIME.
42+
*******************************************************************************/
143
package org.knime.knip.dl4j.node.data.mnist;
244

345
import org.knime.core.node.defaultnodesettings.DefaultNodeSettingsPane;

‎org.knime.knip.dl4j/src/org/knime/knip/dl4j/node/data/mnist/MnistFetcherNodeFactory.java

+42
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
/*******************************************************************************
2+
* Copyright by KNIME GmbH, Konstanz, Germany
3+
* Website: http://www.knime.org; Email: [email protected]
4+
*
5+
* This program is free software; you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License, Version 3, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This program is distributed in the hope that it will be useful, but
10+
* WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License
15+
* along with this program; if not, see <http://www.gnu.org/licenses>.
16+
*
17+
* Additional permission under GNU GPL version 3 section 7:
18+
*
19+
* KNIME interoperates with ECLIPSE solely via ECLIPSE's plug-in APIs.
20+
* Hence, KNIME and ECLIPSE are both independent programs and are not
21+
* derived from each other. Should, however, the interpretation of the
22+
* GNU GPL Version 3 ("License") under any applicable laws result in
23+
* KNIME and ECLIPSE being a combined program, KNIME GMBH herewith grants
24+
* you the additional permission to use and propagate KNIME together with
25+
* ECLIPSE with only the license terms in place for ECLIPSE applying to
26+
* ECLIPSE and the GNU GPL Version 3 applying for KNIME, provided the
27+
* license terms of ECLIPSE themselves allow for the respective use and
28+
* propagation of ECLIPSE together with KNIME.
29+
*
30+
* Additional permission relating to nodes for KNIME that extend the Node
31+
* Extension (and in particular that are based on subclasses of NodeModel,
32+
* NodeDialog, and NodeView) and that only interoperate with KNIME through
33+
* standard APIs ("Nodes"):
34+
* Nodes are deemed to be separate and independent programs and to not be
35+
* covered works. Notwithstanding anything to the contrary in the
36+
* License, the License does not apply to Nodes, you are not required to
37+
* license Nodes under the License, and you are granted a license to
38+
* prepare and propagate Nodes, in each case even if such Nodes are
39+
* propagated with or for interoperation with KNIME. The owner of a Node
40+
* may freely choose the license terms applicable to such Node, including
41+
* when such Node is propagated with or for interoperation with KNIME.
42+
*******************************************************************************/
143
package org.knime.knip.dl4j.node.data.mnist;
244

345
import org.knime.core.node.NodeDialogPane;

‎org.knime.knip.dl4j/src/org/knime/knip/dl4j/node/data/mnist/MnistFetcherNodeModel.java

+42
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
/*******************************************************************************
2+
* Copyright by KNIME GmbH, Konstanz, Germany
3+
* Website: http://www.knime.org; Email: [email protected]
4+
*
5+
* This program is free software; you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License, Version 3, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This program is distributed in the hope that it will be useful, but
10+
* WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License
15+
* along with this program; if not, see <http://www.gnu.org/licenses>.
16+
*
17+
* Additional permission under GNU GPL version 3 section 7:
18+
*
19+
* KNIME interoperates with ECLIPSE solely via ECLIPSE's plug-in APIs.
20+
* Hence, KNIME and ECLIPSE are both independent programs and are not
21+
* derived from each other. Should, however, the interpretation of the
22+
* GNU GPL Version 3 ("License") under any applicable laws result in
23+
* KNIME and ECLIPSE being a combined program, KNIME GMBH herewith grants
24+
* you the additional permission to use and propagate KNIME together with
25+
* ECLIPSE with only the license terms in place for ECLIPSE applying to
26+
* ECLIPSE and the GNU GPL Version 3 applying for KNIME, provided the
27+
* license terms of ECLIPSE themselves allow for the respective use and
28+
* propagation of ECLIPSE together with KNIME.
29+
*
30+
* Additional permission relating to nodes for KNIME that extend the Node
31+
* Extension (and in particular that are based on subclasses of NodeModel,
32+
* NodeDialog, and NodeView) and that only interoperate with KNIME through
33+
* standard APIs ("Nodes"):
34+
* Nodes are deemed to be separate and independent programs and to not be
35+
* covered works. Notwithstanding anything to the contrary in the
36+
* License, the License does not apply to Nodes, you are not required to
37+
* license Nodes under the License, and you are granted a license to
38+
* prepare and propagate Nodes, in each case even if such Nodes are
39+
* propagated with or for interoperation with KNIME. The owner of a Node
40+
* may freely choose the license terms applicable to such Node, including
41+
* when such Node is propagated with or for interoperation with KNIME.
42+
*******************************************************************************/
143
package org.knime.knip.dl4j.node.data.mnist;
244

345
import java.util.ArrayList;

0 commit comments

Comments
 (0)