You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@singa.apache.org by zh...@apache.org on 2017/01/24 09:05:47 UTC
[4/6] incubator-singa git commit: prepare v1.1-rc1; add release notes;
add license for some files
prepare v1.1-rc1; add release notes; add license for some files
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/5d220cd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/5d220cd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/5d220cd5
Branch: refs/heads/master
Commit: 5d220cd5af994a38e66597ba8f392603ffc923f9
Parents: d190fa8
Author: wangwei <wa...@comp.nus.edu.sg>
Authored: Sun Jan 22 15:02:50 2017 +0000
Committer: Wei Wang <wa...@comp.nus.edu.sg>
Committed: Tue Jan 24 16:55:06 2017 +0800
----------------------------------------------------------------------
LICENSE | 13 +++----
RELEASE_NOTES | 36 ++++++++++++++++++++
examples/caffe/run.sh | 16 +++++++++
examples/cifar10/caffe/caffe_net.py | 3 --
java/pom.xml | 17 +++++++++
test/java/Test.java | 18 ++++++++++
tool/debian/python-singa/DEBIAN/postinst | 18 +++++++++-
tool/debian/python-singa/DEBIAN/postrm | 18 +++++++++-
tool/docker/devel/Dockerfile | 16 +++++++++
tool/docker/devel/cuda/Dockerfile | 16 +++++++++
tool/docker/runtime/Dockerfile | 16 +++++++++
tool/docker/runtime/cuda/Dockerfile | 16 +++++++++
.../jenkins/docker/ubuntu14.04/devel/Dockerfile | 16 +++++++++
.../jenkins/docker/ubuntu16.04/devel/Dockerfile | 16 +++++++++
.../docker/ubuntu16.04/runtime/Dockerfile | 18 ++++++++++
15 files changed, 242 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5d220cd5/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7926039..329bb7e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -217,13 +217,13 @@ Copyright (c) 2013-2016, tinydir authors:
All rights reserved.
Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
+ list of conditions and the following disclaimer.
2. 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.
+ and/or other materials provided with the distribution.
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
@@ -243,6 +243,7 @@ include/singa/utils/cuda_utils.h
src/core/tensor/distribution.cl
src/model/layer/im2col.cl
src/model/layer/pooling.cl
+src/proto/caffe.proto
cmake/ThirdParty/FindViennaCL.cmake
COPYRIGHT
@@ -265,13 +266,13 @@ committed.
LICENSE
Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
+ list of conditions and the following disclaimer.
2. 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.
+ and/or other materials provided with the distribution.
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
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5d220cd5/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 083d4d9..85fbe12 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,3 +1,39 @@
+Release Notes - SINGA - Version singa-incubating-1.1.0
+
+SINGA is a general distributed deep learning platform for training big deep learning models over large datasets.
+
+This release includes following features:
+
+
+ * Model components
+ * [SINGA-271] Add Concat and Slice layers
+ * [SINGA-264] Extend the FeedForwardNet to accept multiple inputs
+ * [SINGA-278] Convert trained caffe parameters to singa
+ * [SINGA-287] Add memory size check for cudnn convolution
+ * [SINGA-275] Add Cross Entropy Loss for multiple labels
+ * [SINGA-267] Add spatial mode in batch normalization layer
+ * [SINGA-254] Implement Adam for V1
+
+ * Utility functions and CI
+ * [SINGA-251] Implement image loader for pysinga
+ * [SINGA-284] Add python unittest into Jenkins and link static libs into whl file
+ * [SINGA-280] Jenkins CI support
+ * [SINGA-288] Publish wheel of PySINGA generated by Jenkins to public servers
+ * [SINGA-289] Update SINGA website automatically using Jenkins
+ * [SINGA-266] Add Rafiki python toolkits
+ * [SINGA-255] Compile mandatory depedent libaries together with SINGA code
+ * [SINGA-247] Add windows support for singa
+ * [SINGA-259] Add maven pom file for building java classes
+ * [SINGA-246] Imgtool for image augmentation
+ * [SINGA-252] Use the snapshot methods to dump and load models for pysinga
+ * [SINGA-242] Compile all source files into a single library.
+ * [SINGA-251] Implement image loader for pysinga
+ * [SINGA-244] Separating swig interface and python binding files
+
+ * Bugs fixed
+ * [SINGA-245] float as the first operand can not multiply with a tensor object
+
+---------------------------------------------------------------
Release Notes - SINGA - Version singa-incubating-1.0.0
SINGA is a general distributed deep learning platform for training big deep learning models over large datasets.
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5d220cd5/examples/caffe/run.sh
----------------------------------------------------------------------
diff --git a/examples/caffe/run.sh b/examples/caffe/run.sh
index d33d1f7..031d678 100755
--- a/examples/caffe/run.sh
+++ b/examples/caffe/run.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
if [[ $# -ne 1 ]]; then
echo "usage: $0 model_name"
echo " model_name: [vgg16|vgg19], ..."
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5d220cd5/examples/cifar10/caffe/caffe_net.py
----------------------------------------------------------------------
diff --git a/examples/cifar10/caffe/caffe_net.py b/examples/cifar10/caffe/caffe_net.py
index c73db5c..a32a356 100644
--- a/examples/cifar10/caffe/caffe_net.py
+++ b/examples/cifar10/caffe/caffe_net.py
@@ -18,12 +18,9 @@
import os
from singa import converter
-
def create_net(use_cpu):
net_proto = os.path.abspath('./caffe/cifar10_full_train_test.prototxt')
solver_proto = os.path.abspath('./caffe/cifar10_full_solver.prototxt')
- #net_proto = os.path.abspath('./caffe/cifar10_quick_train_test.prototxt')
- #solver_proto = os.path.abspath('./caffe/cifar10_quick_solver.prototxt')
input_sample_shape = [3, 32, 32, ]
cvt = converter.CaffeConverter(net_proto, solver_proto, input_sample_shape)
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5d220cd5/java/pom.xml
----------------------------------------------------------------------
diff --git a/java/pom.xml b/java/pom.xml
index e29faec..f2820ed 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -1,3 +1,20 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5d220cd5/test/java/Test.java
----------------------------------------------------------------------
diff --git a/test/java/Test.java b/test/java/Test.java
index f9e5411..e4b6e0a 100644
--- a/test/java/Test.java
+++ b/test/java/Test.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import singa.*;
public class Test {
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5d220cd5/tool/debian/python-singa/DEBIAN/postinst
----------------------------------------------------------------------
diff --git a/tool/debian/python-singa/DEBIAN/postinst b/tool/debian/python-singa/DEBIAN/postinst
index 7aee702..269d79c 100755
--- a/tool/debian/python-singa/DEBIAN/postinst
+++ b/tool/debian/python-singa/DEBIAN/postinst
@@ -1,4 +1,20 @@
-#!/bin/bash
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
cd /usr/local/lib/singa
python setup.py install
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5d220cd5/tool/debian/python-singa/DEBIAN/postrm
----------------------------------------------------------------------
diff --git a/tool/debian/python-singa/DEBIAN/postrm b/tool/debian/python-singa/DEBIAN/postrm
index 11add34..6959a45 100755
--- a/tool/debian/python-singa/DEBIAN/postrm
+++ b/tool/debian/python-singa/DEBIAN/postrm
@@ -1,4 +1,20 @@
-#!/bin/bash
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
cd /usr/local/lib/singa
rm -r build dist singa.egg-info
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5d220cd5/tool/docker/devel/Dockerfile
----------------------------------------------------------------------
diff --git a/tool/docker/devel/Dockerfile b/tool/docker/devel/Dockerfile
index c8827cc..c19738d 100644
--- a/tool/docker/devel/Dockerfile
+++ b/tool/docker/devel/Dockerfile
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Base unbuntu 16.04 image
FROM ubuntu:latest
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5d220cd5/tool/docker/devel/cuda/Dockerfile
----------------------------------------------------------------------
diff --git a/tool/docker/devel/cuda/Dockerfile b/tool/docker/devel/cuda/Dockerfile
index 76772ba..d4b84b2 100644
--- a/tool/docker/devel/cuda/Dockerfile
+++ b/tool/docker/devel/cuda/Dockerfile
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Base unbuntu 16.04 image from nvidia/cuda
# Change tags to build with different cuda/cudnn versions:
# FROM nvidia/cuda:8.0-cudnn5-devel-ubuntu16.04
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5d220cd5/tool/docker/runtime/Dockerfile
----------------------------------------------------------------------
diff --git a/tool/docker/runtime/Dockerfile b/tool/docker/runtime/Dockerfile
index 2bdc400..e3a667c 100644
--- a/tool/docker/runtime/Dockerfile
+++ b/tool/docker/runtime/Dockerfile
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Base unbuntu 16.04 image
FROM ubuntu:latest
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5d220cd5/tool/docker/runtime/cuda/Dockerfile
----------------------------------------------------------------------
diff --git a/tool/docker/runtime/cuda/Dockerfile b/tool/docker/runtime/cuda/Dockerfile
index c2ec929..26ed5b4 100644
--- a/tool/docker/runtime/cuda/Dockerfile
+++ b/tool/docker/runtime/cuda/Dockerfile
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Base unbuntu 16.04, cuda8.0, cudnn5
FROM nvidia/cuda:8.0-cudnn5-runtime-ubuntu16.04
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5d220cd5/tool/jenkins/docker/ubuntu14.04/devel/Dockerfile
----------------------------------------------------------------------
diff --git a/tool/jenkins/docker/ubuntu14.04/devel/Dockerfile b/tool/jenkins/docker/ubuntu14.04/devel/Dockerfile
index 827eb31..4d0edff 100644
--- a/tool/jenkins/docker/ubuntu14.04/devel/Dockerfile
+++ b/tool/jenkins/docker/ubuntu14.04/devel/Dockerfile
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Base unbuntu 14.04 image from nvidia/cuda
# Change tags to build with different cuda/cudnn versions:
# FROM nvidia/cuda:8.0-cudnn5-devel
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5d220cd5/tool/jenkins/docker/ubuntu16.04/devel/Dockerfile
----------------------------------------------------------------------
diff --git a/tool/jenkins/docker/ubuntu16.04/devel/Dockerfile b/tool/jenkins/docker/ubuntu16.04/devel/Dockerfile
index 3faf0a7..8a6e26f 100644
--- a/tool/jenkins/docker/ubuntu16.04/devel/Dockerfile
+++ b/tool/jenkins/docker/ubuntu16.04/devel/Dockerfile
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Base unbuntu 16.04 image from nvidia/cuda
# Change tags to build with different cuda/cudnn versions:
# FROM nvidia/cuda:8.0-cudnn5-devel-ubuntu16.04
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5d220cd5/tool/jenkins/docker/ubuntu16.04/runtime/Dockerfile
----------------------------------------------------------------------
diff --git a/tool/jenkins/docker/ubuntu16.04/runtime/Dockerfile b/tool/jenkins/docker/ubuntu16.04/runtime/Dockerfile
index 2aeea94..089d10f 100644
--- a/tool/jenkins/docker/ubuntu16.04/runtime/Dockerfile
+++ b/tool/jenkins/docker/ubuntu16.04/runtime/Dockerfile
@@ -1,3 +1,21 @@
+#!/usr/bin/env sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Base unbuntu 16.04 image
FROM ubuntu:latest