OverviewFilesCommitsIssuesDocsReleasesPeers

opencog-CompactHash commits / ca5222a

Updating copyright to Triad
ca5222ad0f811a8e663a0bf3479f649771331a44
by Bob Robey <brobey@lanl.gov> · 2019-07-07T00:50:35.000Z

Changed files (6) +53 -73

LICENSE +6 -21
……@@ -1,21 +1,9 @@
1
2/* The hash code has been released under an open-source Apache 2 license to
3 * encourage further development of hashing methods. Under this license, it is
4 * required to include a reference to this work. Through a web search we hope
5 * to gather statistics on the use of the method and its improvements
6 * and help to encourage more open technology transfer by LANL and other
7 * government research organizations. This can be thought of as analagous
8 * to journal article citations, but within software products. If code is not
9 * distributed with a software product, a reference should be provided in a text
10 * file so that attribution can be determined.
11 */
12
13/* Copyright 2013-14. Los Alamos National Security, LLC. This material was produced
14 * under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National
15 * Laboratory (LANL), which is operated by Los Alamos National Security, LLC
1/* Copyright 2013-19. Triad National Security, LLC. This material was produced
2 * under U.S. Government contract 89233218CNA000001 for Los Alamos National
3 * Laboratory (LANL), which is operated by Triad National Security, LLC
164 * for the U.S. Department of Energy. The U.S. Government has rights to use,
17 * reproduce, and distribute this software. NEITHER THE GOVERNMENT NOR LOS
18 * ALAMOS NATIONAL SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
5 * reproduce, and distribute this software. NEITHER THE GOVERNMENT NOR
6 * TRIAD NATIONAL SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
197 * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified
208 * to produce derivative works, such modified software should be clearly marked,
219 * so as not to confuse it with the version available from LANL.
……@@ -34,10 +22,7 @@
3422 * Under this license, it is required to include a reference to this work. We
3523 * request that each derivative work contain a reference to LANL Copyright
3624 * Disclosure C14043/LA-CC-14-003 so that this work's impact can be roughly
37 * measured. In addition, it is requested that a modifier is included as in
38 * the following example:
39 *
40 * //<Uses | improves on | modified from> LANL Copyright Disclosure C14043/LA-CC-14-003
25 * measured.
4126 *
4227 * This is LANL Copyright Disclosure C14043/LA-CC-14-003
4328 */
NOTICE +3 -3
……@@ -1,5 +1,5 @@
11This is the code released under LANL Copyright Disclosure C14043/LA-CC-14-003
2Copyright 2013. Los Alamos National Security, LLC. This material was produced
3under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National
4Laboratory (LANL), which is operated by Los Alamos National Security, LLC
2Copyright 2013-2019. Triad National Security, LLC. This material was produced
3under U.S. Government contract 89233218CNA000001 for Los Alamos National
4Laboratory (LANL), which is operated by Triad National Security, LLC
55for the U.S. Department of Energy. See LICENSE file for details.
gpu.c +12 -12
……@@ -1,16 +1,16 @@
1/* Copyright 2013-14. Los Alamos National Security, LLC. This material was produced
2 * under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National
3 * Laboratory (LANL), which is operated by Los Alamos National Security, LLC
1/* Copyright 2013-19. Triad National Security, LLC. This material was produced
2 * under U.S. Government contract 89233218CNA000001 for Los Alamos National
3 * Laboratory (LANL), which is operated by Triad National Security, LLC
44 * for the U.S. Department of Energy. The U.S. Government has rights to use,
5 * reproduce, and distribute this software. NEITHER THE GOVERNMENT NOR LOS
6 * ALAMOS NATIONAL SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
5 * reproduce, and distribute this software. NEITHER THE GOVERNMENT NOR
6 * TRIAD NATIONAL SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
77 * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified
88 * to produce derivative works, such modified software should be clearly marked,
99 * so as not to confuse it with the version available from LANL.
1010 *
1111 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
1212 * use this file except in compliance with the License. You may obtain a copy
13 * of the License at
13 * of the License at
1414 *
1515 * http://www.apache.org/licenses/LICENSE-2.0
1616 *
……@@ -20,18 +20,18 @@
2020 * specific language governing permissions and limitations under the License.
2121 *
2222 * Under this license, it is required to include a reference to this work. We
23 * request that each derivative work contain a reference to LANL Copyright
23 * request that each derivative work contain a reference to LANL Copyright
2424 * Disclosure C14043/LA-CC-14-003 so that this work's impact can be roughly
25 * measured.
25 * measured.
2626 *
2727 * This is LANL Copyright Disclosure C14043/LA-CC-14-003
2828 */
2929
3030/*
31 * Authors: Bob Robey XCP-2 brobey@lanl.gov
32 * Peter Ahrens peter.ahrens@lanl.gov, ptrahrens@gmail.com
33 * Sara Hartse sara@lanl.gov, sara.hartse@gmail.com
34 * Rebecka Tumblin rtumblin@lanl.gov, rebeckatumblin@gmail.com
31 * Authors: Bob Robey XCP-2 brobey@lanl.gov
32 * Peter Ahrens XCP-2 peter.ahrens@lanl.gov, ptrahrens@gmail.com
33 * Sara Hartse XCP-2 sara@lanl.gov,
34 * Rebecka Tumblin rtumblin@lanl.gov, rebeckatumblin@gmail.com
3535 */
3636
3737/* Modified from LANL Copyright Disclosure C13002/LA-CC-12-022 */
gpu.h +11 -11
……@@ -1,16 +1,16 @@
1/* Copyright 2013-14. Los Alamos National Security, LLC. This material was produced
2 * under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National
3 * Laboratory (LANL), which is operated by Los Alamos National Security, LLC
1/* Copyright 2013-19. Triad National Security, LLC. This material was produced
2 * under U.S. Government contract 89233218CNA000001 for Los Alamos National
3 * Laboratory (LANL), which is operated by Triad National Security, LLC
44 * for the U.S. Department of Energy. The U.S. Government has rights to use,
5 * reproduce, and distribute this software. NEITHER THE GOVERNMENT NOR LOS
6 * ALAMOS NATIONAL SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
5 * reproduce, and distribute this software. NEITHER THE GOVERNMENT NOR
6 * TRIAD NATIONAL SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
77 * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified
88 * to produce derivative works, such modified software should be clearly marked,
99 * so as not to confuse it with the version available from LANL.
1010 *
1111 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
1212 * use this file except in compliance with the License. You may obtain a copy
13 * of the License at
13 * of the License at
1414 *
1515 * http://www.apache.org/licenses/LICENSE-2.0
1616 *
……@@ -20,7 +20,7 @@
2020 * specific language governing permissions and limitations under the License.
2121 *
2222 * Under this license, it is required to include a reference to this work. We
23 * request that each derivative work contain a reference to LANL Copyright
23 * request that each derivative work contain a reference to LANL Copyright
2424 * Disclosure C14043/LA-CC-14-003 so that this work's impact can be roughly
2525 * measured.
2626 *
……@@ -28,10 +28,10 @@
2828 */
2929
3030/*
31 * Authors: Bob Robey XCP-2 brobey@lanl.gov
32 * Peter Ahrens peter.ahrens@lanl.gov, ptrahrens@gmail.com
33 * Sara Hartse sara@lanl.gov, sara.hartse@gmail.com
34 * Rebecka Tumblin rtumblin@lanl.gov, rebeckatumblin@gmail.com
31 * Authors: Bob Robey XCP-2 brobey@lanl.gov
32 * Peter Ahrens XCP-2 peter.ahrens@lanl.gov, ptrahrens@gmail.com
33 * Sara Hartse XCP-2 sara@lanl.gov,
34 * Rebecka Tumblin rtumblin@lanl.gov, rebeckatumblin@gmail.com
3535 */
3636
3737/* Modified from LANL Copyright Disclosure C13002/LA-CC-12-022 */
neigh2d.c +11 -13
……@@ -1,9 +1,9 @@
1/* Copyright 2013-14. Los Alamos National Security, LLC. This material was produced
2 * under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National
3 * Laboratory (LANL), which is operated by Los Alamos National Security, LLC
1/* Copyright 2013-19. Triad National Security, LLC. This material was produced
2 * under U.S. Government contract 89233218CNA000001 for Los Alamos National
3 * Laboratory (LANL), which is operated by Triad National Security, LLC
44 * for the U.S. Department of Energy. The U.S. Government has rights to use,
5 * reproduce, and distribute this software. NEITHER THE GOVERNMENT NOR LOS
6 * ALAMOS NATIONAL SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
5 * reproduce, and distribute this software. NEITHER THE GOVERNMENT NOR
6 * TRIAD NATIONAL SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
77 * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified
88 * to produce derivative works, such modified software should be clearly marked,
99 * so as not to confuse it with the version available from LANL.
……@@ -22,20 +22,18 @@
2222 * Under this license, it is required to include a reference to this work. We
2323 * request that each derivative work contain a reference to LANL Copyright
2424 * Disclosure C14043/LA-CC-14-003 so that this work's impact can be roughly
25 * measured. In addition, it is requested that a modifier is included as in
26 * the following example:
27 *
28 * //<Uses | improves on | modified from> LANL Copyright Disclosure C14043/LA-CC-14-003
25 * measured.
2926 *
3027 * This is LANL Copyright Disclosure C14043/LA-CC-14-003
3128 */
3229
3330/*
34 * Authors: Bob Robey XCP-2 brobey@lanl.gov
35 * Peter Ahrens peter.ahrens@lanl.gov, ptrahrens@gmail.com
36 * Sara Hartse sara@lanl.gov, sara.hartse@gmail.com
37 * Rebecka Tumblin rtumblin@lanl.gov, rebeckatumblin@gmail.com
31 * Authors: Bob Robey XCP-2 brobey@lanl.gov
32 * Peter Ahrens XCP-2 peter.ahrens@lanl.gov, ptrahrens@gmail.com
33 * Sara Hartse XCP-2 sara@lanl.gov,
34 * Rebecka Tumblin rtumblin@lanl.gov, rebeckatumblin@gmail.com
3835 */
36
3937//#ifdef HAVE_CONFIG_H
4038//#include "config.h"
4139//#endif
neigh2d_kern.cl +10 -13
……@@ -1,9 +1,9 @@
1/* Copyright 2013-14. Los Alamos National Security, LLC. This material was produced
2 * under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National
3 * Laboratory (LANL), which is operated by Los Alamos National Security, LLC
1/* Copyright 2013-19. Triad National Security, LLC. This material was produced
2 * under U.S. Government contract 89233218CNA000001 for Los Alamos National
3 * Laboratory (LANL), which is operated by Triad National Security, LLC
44 * for the U.S. Department of Energy. The U.S. Government has rights to use,
5 * reproduce, and distribute this software. NEITHER THE GOVERNMENT NOR LOS
6 * ALAMOS NATIONAL SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
5 * reproduce, and distribute this software. NEITHER THE GOVERNMENT NOR
6 * TRIAD NATIONAL SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
77 * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified
88 * to produce derivative works, such modified software should be clearly marked,
99 * so as not to confuse it with the version available from LANL.
……@@ -22,19 +22,16 @@
2222 * Under this license, it is required to include a reference to this work. We
2323 * request that each derivative work contain a reference to LANL Copyright
2424 * Disclosure C14043/LA-CC-14-003 so that this work's impact can be roughly
25 * measured. In addition, it is requested that a modifier is included as in
26 * the following example:
27 *
28 * //<Uses | improves on | modified from> LANL Copyright Disclosure C14043/LA-CC-14-003
25 * measured.
2926 *
3027 * This is LANL Copyright Disclosure C14043/LA-CC-14-003
3128 */
3229
3330/*
34 * Authors: Bob Robey XCP-2 brobey@lanl.gov
35 * Peter Ahrens peter.ahrens@lanl.gov, ptrahrens@gmail.com
36 * Sara Hartse sara@lanl.gov, sara.hartse@gmail.com
37 * Rebecka Tumblin rtumblin@lanl.gov, rebeckatumblin@gmail.com
31 * Authors: Bob Robey XCP-2 brobey@lanl.gov
32 * Peter Ahrens XCP-2 peter.ahrens@lanl.gov, ptrahrens@gmail.com
33 * Sara Hartse XCP-2 sara@lanl.gov,
34 * Rebecka Tumblin rtumblin@lanl.gov, rebeckatumblin@gmail.com
3835 */
3936
4037/* neigh2d_kern.cl */