Updated header and few other minor fixes

Ermin-Gong · Oct 6, 2016 · 155235e · 155235e
1 parent 76fc000
commit 155235e
Show file tree

Hide file tree

Showing 12 changed files with 255 additions and 308 deletions.
diff --git a/code/intel/convolution/libxsmm_conv/run_libxsmm_conv_ia.sh b/code/intel/convolution/libxsmm_conv/run_libxsmm_conv_ia.sh
@@ -1,28 +1,23 @@
+#******************************************************************************
+# Copyright 2016 Intel Corporation
+#
+# Licensed 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.
 #*******************************************************************************
-# * Copyright 2016 Intel Corporation All Rights Reserved.
-# *
-# * The source code,  information  and material  ("Material") contained  herein is
-# * owned by Intel Corporation or its  suppliers or licensors,  and  title to such
-# * Material remains with Intel  Corporation or its  suppliers or  licensors.  The
-# * Material  contains  proprietary  information  of  Intel or  its suppliers  and
-# * licensors.  The Material is protected by  worldwide copyright  laws and treaty
-# * provisions.  No part  of  the  Material   may  be  used,  copied,  reproduced,
-# * modified, published,  uploaded, posted, transmitted,  distributed or disclosed
-# * in any way without Intel's prior express written permission.  No license under
-# * any patent,  copyright or other  intellectual property rights  in the Material
-# * is granted to  or  conferred  upon  you,  either   expressly,  by implication,
-# * inducement,  estoppel  or  otherwise.  Any  license   under such  intellectual
-# * property rights must be express and approved by Intel in writing.
-# *
-# * Unless otherwise agreed by Intel in writing,  you may not remove or alter this
-# * notice or  any  other  notice   embedded  in  Materials  by  Intel  or Intel's
-# * suppliers or licensors in any way.
-# *******************************************************************************/
 
 #!/bin/bash
 export KMP_PLACE_THREADS=1T
 export KMP_AFFINITY=compact,granularity=fine
-export OMP_NUM_THREADS=66
+export OMP_NUM_THREADS=64
 
 # source ICC
 echo "Please source appropriate versions of Intel Compiler (ICC), Intel MPI and  Intel MKL !"
@@ -37,14 +32,16 @@ cd libxsmm
 
 echo "Building libxsmm..."
 make realclean
-make &> /dev/null
+make -j &> /dev/null
 
 cd samples/dnn
+pwd
 make realclean
-make &> /dev/null
+make -j &> /dev/null
 
 cd ../../
-BIN=samples/dnn/fwd_layer_example
+pwd
+BIN=samples/dnn/layer_example_f32
 ITERS=1000
 NUMA=1
 

diff --git a/code/intel/convolution/mkl_conv/Makefile b/code/intel/convolution/mkl_conv/Makefile
@@ -1,23 +1,19 @@
+#******************************************************************************
+# Copyright 2016 Intel Corporation
+#  
+# Licensed 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.
 #*******************************************************************************
-#* Copyright 2016 Intel Corporation All Rights Reserved.
-#*
-#* The source code,  information  and material  ("Material") contained  herein is
-#* owned by Intel Corporation or its  suppliers or licensors,  and  title to such
-#* Material remains with Intel  Corporation or its  suppliers or  licensors.  The
-#* Material  contains  proprietary  information  of  Intel or  its suppliers  and
-#* licensors.  The Material is protected by  worldwide copyright  laws and treaty
-#* provisions.  No part  of  the  Material   may  be  used,  copied,  reproduced,
-#* modified, published,  uploaded, posted, transmitted,  distributed or disclosed
-#* in any way without Intel's prior express written permission.  No license under
-#* any patent,  copyright or other  intellectual property rights  in the Material
-#* is granted to  or  conferred  upon  you,  either   expressly,  by implication,
-#* inducement,  estoppel  or  otherwise.  Any  license   under such  intellectual
-#* property rights must be express and approved by Intel in writing.
-#*
-#* Unless otherwise agreed by Intel in writing,  you may not remove or alter this
-#* notice or  any  other  notice   embedded  in  Materials  by  Intel  or Intel's
-#* suppliers or licensors in any way.
-#*******************************************************************************
+
 
 CC       =  icc
 CFLAGS   =  -O3 -Wall -I$(MKLROOT)/include -qopenmp -std=c++11

diff --git a/code/intel/convolution/mkl_conv/input.h b/code/intel/convolution/mkl_conv/input.h
@@ -1,23 +1,18 @@
 /*******************************************************************************
- * Copyright 2016 Intel Corporation All Rights Reserved.
- *
- * The source code,  information  and material  ("Material") contained  herein is
- * owned by Intel Corporation or its  suppliers or licensors,  and  title to such
- * Material remains with Intel  Corporation or its  suppliers or  licensors.  The
- * Material  contains  proprietary  information  of  Intel or  its suppliers  and
- * licensors.  The Material is protected by  worldwide copyright  laws and treaty
- * provisions.  No part  of  the  Material   may  be  used,  copied,  reproduced,
- * modified, published,  uploaded, posted, transmitted,  distributed or disclosed
- * in any way without Intel's prior express written permission.  No license under
- * any patent,  copyright or other  intellectual property rights  in the Material
- * is granted to  or  conferred  upon  you,  either   expressly,  by implication,
- * inducement,  estoppel  or  otherwise.  Any  license   under such  intellectual
- * property rights must be express and approved by Intel in writing.
- *
- * Unless otherwise agreed by Intel in writing,  you may not remove or alter this
- * notice or  any  other  notice   embedded  in  Materials  by  Intel  or Intel's
- * suppliers or licensors in any way.
- *******************************************************************************/
+* Copyright 2016 Intel Corporation
+*
+* Licensed 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.
+*******************************************************************************/
 
  typedef struct conv_params {
     int groups;

diff --git a/code/intel/convolution/mkl_conv/run_mkl_conv_ia.sh b/code/intel/convolution/mkl_conv/run_mkl_conv_ia.sh
@@ -1,23 +1,18 @@
+#******************************************************************************
+# Copyright 2016 Intel Corporation
+#
+# Licensed 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.
 #*******************************************************************************
-# * Copyright 2016 Intel Corporation All Rights Reserved.
-# *
-# * The source code,  information  and material  ("Material") contained  herein is
-# * owned by Intel Corporation or its  suppliers or licensors,  and  title to such
-# * Material remains with Intel  Corporation or its  suppliers or  licensors.  The
-# * Material  contains  proprietary  information  of  Intel or  its suppliers  and
-# * licensors.  The Material is protected by  worldwide copyright  laws and treaty
-# * provisions.  No part  of  the  Material   may  be  used,  copied,  reproduced,
-# * modified, published,  uploaded, posted, transmitted,  distributed or disclosed
-# * in any way without Intel's prior express written permission.  No license under
-# * any patent,  copyright or other  intellectual property rights  in the Material
-# * is granted to  or  conferred  upon  you,  either   expressly,  by implication,
-# * inducement,  estoppel  or  otherwise.  Any  license   under such  intellectual
-# * property rights must be express and approved by Intel in writing.
-# *
-# * Unless otherwise agreed by Intel in writing,  you may not remove or alter this
-# * notice or  any  other  notice   embedded  in  Materials  by  Intel  or Intel's
-# * suppliers or licensors in any way.
-# *******************************************************************************/
 
 #!/bin/bash
 echo "Please source appropriate versions of Intel Compiler (ICC), Intel MPI and  Intel MKL !"

diff --git a/code/intel/convolution/mkl_conv/std_conv_bench.cpp b/code/intel/convolution/mkl_conv/std_conv_bench.cpp
@@ -1,23 +1,20 @@
 /*******************************************************************************
-* Copyright 2015-2016 Intel Corporation All Rights Reserved.
+* Copyright 2016 Intel Corporation
 *
-* The source code,  information  and material  ("Material") contained  herein is
-* owned by Intel Corporation or its  suppliers or licensors,  and  title to such
-* Material remains with Intel  Corporation or its  suppliers or  licensors.  The
-* Material  contains  proprietary  information  of  Intel or  its suppliers  and
-* licensors.  The Material is protected by  worldwide copyright  laws and treaty
-* provisions.  No part  of  the  Material   may  be  used,  copied,  reproduced,
-* modified, published,  uploaded, posted, transmitted,  distributed or disclosed
-* in any way without Intel's prior express written permission.  No license under
-* any patent,  copyright or other  intellectual property rights  in the Material
-* is granted to  or  conferred  upon  you,  either   expressly,  by implication,
-* inducement,  estoppel  or  otherwise.  Any  license   under such  intellectual
-* property rights must be express and approved by Intel in writing.
+* Licensed 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
 *
-* Unless otherwise agreed by Intel in writing,  you may not remove or alter this
-* notice or  any  other  notice   embedded  in  Materials  by  Intel  or Intel's
-* suppliers or licensors in any way.
+*     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.
 *******************************************************************************/
+
+
 #define _GNU_SOURCES
 #define _GNU_SOURCES
 #include <stdio.h>

diff --git a/code/intel/convolution/run_conv_ia.sh b/code/intel/convolution/run_conv_ia.sh
@@ -1,23 +1,18 @@
+#******************************************************************************
+# Copyright 2016 Intel Corporation
+#
+# Licensed 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.
 #*******************************************************************************
-# * Copyright 2016 Intel Corporation All Rights Reserved.
-# *
-# * The source code,  information  and material  ("Material") contained  herein is
-# * owned by Intel Corporation or its  suppliers or licensors,  and  title to such
-# * Material remains with Intel  Corporation or its  suppliers or  licensors.  The
-# * Material  contains  proprietary  information  of  Intel or  its suppliers  and
-# * licensors.  The Material is protected by  worldwide copyright  laws and treaty
-# * provisions.  No part  of  the  Material   may  be  used,  copied,  reproduced,
-# * modified, published,  uploaded, posted, transmitted,  distributed or disclosed
-# * in any way without Intel's prior express written permission.  No license under
-# * any patent,  copyright or other  intellectual property rights  in the Material
-# * is granted to  or  conferred  upon  you,  either   expressly,  by implication,
-# * inducement,  estoppel  or  otherwise.  Any  license   under such  intellectual
-# * property rights must be express and approved by Intel in writing.
-# *
-# * Unless otherwise agreed by Intel in writing,  you may not remove or alter this
-# * notice or  any  other  notice   embedded  in  Materials  by  Intel  or Intel's
-# * suppliers or licensors in any way.
-# *******************************************************************************/
 
 #!/bin/bash
 

diff --git a/code/intel/run_DeepBench_ia.sh b/code/intel/run_DeepBench_ia.sh
@@ -1,23 +1,19 @@
+#******************************************************************************
+# Copyright 2016 Intel Corporation
+#
+# Licensed 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.
 #*******************************************************************************
-# * Copyright 2016 Intel Corporation All Rights Reserved.
-# *
-# * The source code,  information  and material  ("Material") contained  herein is
-# * owned by Intel Corporation or its  suppliers or licensors,  and  title to such
-# * Material remains with Intel  Corporation or its  suppliers or  licensors.  The
-# * Material  contains  proprietary  information  of  Intel or  its suppliers  and
-# * licensors.  The Material is protected by  worldwide copyright  laws and treaty
-# * provisions.  No part  of  the  Material   may  be  used,  copied,  reproduced,
-# * modified, published,  uploaded, posted, transmitted,  distributed or disclosed
-# * in any way without Intel's prior express written permission.  No license under
-# * any patent,  copyright or other  intellectual property rights  in the Material
-# * is granted to  or  conferred  upon  you,  either   expressly,  by implication,
-# * inducement,  estoppel  or  otherwise.  Any  license   under such  intellectual
-# * property rights must be express and approved by Intel in writing.
-# *
-# * Unless otherwise agreed by Intel in writing,  you may not remove or alter this
-# * notice or  any  other  notice   embedded  in  Materials  by  Intel  or Intel's
-# * suppliers or licensors in any way.
-# *******************************************************************************/
+
 
 #!/bin/bash
 

diff --git a/code/intel/sgemm/Makefile b/code/intel/sgemm/Makefile
@@ -1,23 +1,18 @@
-#*******************************************************************************
-#* Copyright 2016 Intel Corporation All Rights Reserved.
-#*
-#* The source code,  information  and material  ("Material") contained  herein is
-#* owned by Intel Corporation or its  suppliers or licensors,  and  title to such
-#* Material remains with Intel  Corporation or its  suppliers or  licensors.  The
-#* Material  contains  proprietary  information  of  Intel or  its suppliers  and
-#* licensors.  The Material is protected by  worldwide copyright  laws and treaty
-#* provisions.  No part  of  the  Material   may  be  used,  copied,  reproduced,
-#* modified, published,  uploaded, posted, transmitted,  distributed or disclosed
-#* in any way without Intel's prior express written permission.  No license under
-#* any patent,  copyright or other  intellectual property rights  in the Material
-#* is granted to  or  conferred  upon  you,  either   expressly,  by implication,
-#* inducement,  estoppel  or  otherwise.  Any  license   under such  intellectual
-#* property rights must be express and approved by Intel in writing.
-#*
-#* Unless otherwise agreed by Intel in writing,  you may not remove or alter this
-#* notice or  any  other  notice   embedded  in  Materials  by  Intel  or Intel's
-#* suppliers or licensors in any way.
-#*******************************************************************************
+#******************************************************************************
+# Copyright 2016 Intel Corporation
+#  
+# Licensed 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.
+# ******************************************************************************
 
 CC       =  icc
 CFLAGS	 =  -O2 -Wall -I$(MKLROOT)/include -openmp

diff --git a/code/intel/sgemm/input.h b/code/intel/sgemm/input.h
@@ -1,23 +1,18 @@
 /*******************************************************************************
- * Copyright 2016 Intel Corporation All Rights Reserved.
- *
- * The source code,  information  and material  ("Material") contained  herein is
- * owned by Intel Corporation or its  suppliers or licensors,  and  title to such
- * Material remains with Intel  Corporation or its  suppliers or  licensors.  The
- * Material  contains  proprietary  information  of  Intel or  its suppliers  and
- * licensors.  The Material is protected by  worldwide copyright  laws and treaty
- * provisions.  No part  of  the  Material   may  be  used,  copied,  reproduced,
- * modified, published,  uploaded, posted, transmitted,  distributed or disclosed
- * in any way without Intel's prior express written permission.  No license under
- * any patent,  copyright or other  intellectual property rights  in the Material
- * is granted to  or  conferred  upon  you,  either   expressly,  by implication,
- * inducement,  estoppel  or  otherwise.  Any  license   under such  intellectual
- * property rights must be express and approved by Intel in writing.
- *
- * Unless otherwise agreed by Intel in writing,  you may not remove or alter this
- * notice or  any  other  notice   embedded  in  Materials  by  Intel  or Intel's
- * suppliers or licensors in any way.
- *******************************************************************************/
+* Copyright 2016 Intel Corporation
+*
+* Licensed 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.
+*******************************************************************************/
 
 typedef struct gemm_params {
     char transa;