You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by je...@apache.org on 2021/08/25 17:58:24 UTC
[incubator-mxnet] branch v1.x updated: backport changes with ASF
license issues (#20544)
This is an automated email from the ASF dual-hosted git repository.
jevans pushed a commit to branch v1.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.x by this push:
new af6b19c backport changes with ASF license issues (#20544)
af6b19c is described below
commit af6b19ce2d95ad6680df6b42e1d9b68fdcc8e51b
Author: Hongshan Li <li...@gmail.com>
AuthorDate: Wed Aug 25 10:56:47 2021 -0700
backport changes with ASF license issues (#20544)
---
cmake/Modules/FindJeMalloc.cmake | 18 ------------------
rat-excludes | 1 +
src/operator/nn/mkldnn/mkldnn_base-inl.h | 19 -------------------
tools/license_header.py | 4 ++++
4 files changed, 5 insertions(+), 37 deletions(-)
diff --git a/cmake/Modules/FindJeMalloc.cmake b/cmake/Modules/FindJeMalloc.cmake
index f3ca06f..b5f9efb 100644
--- a/cmake/Modules/FindJeMalloc.cmake
+++ b/cmake/Modules/FindJeMalloc.cmake
@@ -1,21 +1,3 @@
-# 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.
-
-
# Copyright (c) 2014 Thomas Heller
# Copyright (c) 2007-2012 Hartmut Kaiser
# Copyright (c) 2010-2011 Matt Anderson
diff --git a/rat-excludes b/rat-excludes
index 5fc635c..488a228 100644
--- a/rat-excludes
+++ b/rat-excludes
@@ -129,6 +129,7 @@ deformable_im2col.h
modulated_deformable_im2col.cuh
modulated_deformable_im2col.h
FindCUDAToolkit.cmake
+FindJeMalloc.cmake
select_compute_arch.cmake
# AL2 License header not at the beginning of the file
diff --git a/src/operator/nn/mkldnn/mkldnn_base-inl.h b/src/operator/nn/mkldnn/mkldnn_base-inl.h
index 5ac053e..515d2f4 100644
--- a/src/operator/nn/mkldnn/mkldnn_base-inl.h
+++ b/src/operator/nn/mkldnn/mkldnn_base-inl.h
@@ -1,22 +1,3 @@
-/*
- * 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.
- */
-
/*******************************************************************************
* Copyright 2016-2017 Intel Corporation
*
diff --git a/tools/license_header.py b/tools/license_header.py
index e469344..04544cf 100755
--- a/tools/license_header.py
+++ b/tools/license_header.py
@@ -115,12 +115,16 @@ _WHITE_LIST = [
# Licensed under 2-Clause BSD in header
'example/ssd/dataset/pycocotools/coco.py',
+
+ # Licensed under the Boost Software License, Version 1.0
+ 'cmake/Modules/FindJeMalloc.cmake',
# Julia package metadata, generated by Pkg3.jl
'julia/Project.toml',
# Licensed under Apache 2.0 license
'example/image-classification/predict-cpp/image-classification-predict.cc',
+ 'src/operator/nn/mkldnn/mkldnn_base-inl.h',
# This file
'tools/license_header.py',