Skip to content

Commit 2728fc8

Browse files
authored
Merge pull request #2 from amd/dev
Merge for AOCL 3.0 release.
2 parents 32365b3 + 3c3160f commit 2728fc8

File tree

531 files changed

+98078
-9678
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

531 files changed

+98078
-9678
lines changed

CHANGELOG

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9683,7 +9683,7 @@ Date: Fri Feb 23 17:42:48 2018 -0600
96839683

96849684
CHANGELOG update (0.3.0)
96859685

9686-
commit 3defc7265c12cf85e9de2d7a1f243c5e090a6f9d (origin/master, origin/HEAD)
9686+
commit 3defc7265c12cf85e9de2d7a1f243c5e090a6f9d
96879687
Author: Field G. Van Zee <[email protected]>
96889688
Date: Fri Feb 23 17:38:19 2018 -0600
96899689

@@ -9719,7 +9719,7 @@ Date: Fri Feb 23 16:33:32 2018 -0600
97199719
contained. To remedy this situation, we now selectively use movss to
97209720
load any element that could be the last element in the matrix.
97219721

9722-
commit 5112e1859e7f8888f5555eb7bc02bd9fab9b4442 (origin/rt, rt)
9722+
commit 5112e1859e7f8888f5555eb7bc02bd9fab9b4442 (origin/rt)
97239723
Author: Field G. Van Zee <[email protected]>
97249724
Date: Fri Feb 23 14:31:26 2018 -0600
97259725

@@ -9951,7 +9951,7 @@ Date: Thu Jan 4 20:51:35 2018 -0600
99519951
time hardware detection (when clang is selected).
99529952
- Added some missing (but mostly-optional) quotes to configure script.
99539953

9954-
commit 5a7005dd44ed3174abbe360981e367fd41c99b4b (origin/amd, amd)
9954+
commit 5a7005dd44ed3174abbe360981e367fd41c99b4b
99559955
Merge: 7be88705 3bc99a96
99569956
Author: Nisanth M P <[email protected]>
99579957
Date: Wed Jan 3 12:05:12 2018 +0530
@@ -10000,7 +10000,7 @@ Date: Sat Dec 23 15:32:03 2017 -0600
1000010000
is used by the auto-detection script to printf() the name of the
1000110001
sub-configuration corresponding to the detected hardware.
1000210002

10003-
commit 9804adfd405056ec332bb8e13d68c7b52bd3a6c1 (origin/selfinit, selfinit)
10003+
commit 9804adfd405056ec332bb8e13d68c7b52bd3a6c1 (origin/selfinit)
1000410004
Author: Field G. Van Zee <[email protected]>
1000510005
Date: Thu Dec 21 19:22:57 2017 -0600
1000610006

CMakeLists.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
cmake_minimum_required(VERSION 3.0.0)
44

5-
project(AOCL-LibBlis-Win C)
5+
project(AOCL-LibBlis-Win-MT C)
66

77
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
88
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
99
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
1010
if (MSVC)
11-
set(TARGET_ARCH zen2)
11+
set(TARGET_ARCH zen3)
1212
message(STATUS "Setting MSVC flags2")
1313
message(${TARGET_ARCH})
1414
option(BUILD_SHARED_LIBS "Build shared library" ON)
@@ -99,6 +99,7 @@ include_directories(${CMAKE_SOURCE_DIR}/frame/2/trsv)
9999
include_directories(${CMAKE_SOURCE_DIR}/frame/3)
100100
include_directories(${CMAKE_SOURCE_DIR}/frame/3/gemm)
101101
include_directories(${CMAKE_SOURCE_DIR}/frame/3/gemm/ind)
102+
include_directories(${CMAKE_SOURCE_DIR}/frame/3/gemmt)
102103
include_directories(${CMAKE_SOURCE_DIR}/frame/3/hemm)
103104
include_directories(${CMAKE_SOURCE_DIR}/frame/3/her2k)
104105
include_directories(${CMAKE_SOURCE_DIR}/frame/3/herk)
@@ -129,15 +130,17 @@ include_directories(${CMAKE_SOURCE_DIR}/kernels)
129130
include_directories(${CMAKE_SOURCE_DIR}/kernels/haswell)
130131
include_directories(${CMAKE_SOURCE_DIR}/kernels/haswell/3)
131132
include_directories(${CMAKE_SOURCE_DIR}/kernels/haswell/3/sup)
133+
include_directories(${CMAKE_SOURCE_DIR}/kernels/haswell/3/sup/d6x8)
132134
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen)
133135
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen/1)
134136
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen/1f)
135137
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen/1m)
138+
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen/2)
136139
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen/3)
137140
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen/3/sup)
138-
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen2)
139-
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen2/1f)
140-
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen2/2)
141+
#include_directories(${CMAKE_SOURCE_DIR}/kernels/zen2)
142+
#include_directories(${CMAKE_SOURCE_DIR}/kernels/zen2/1f)
143+
#include_directories(${CMAKE_SOURCE_DIR}/kernels/zen2/2)
141144

142145
file(GLOB headers ${CMAKE_SOURCE_DIR}/*.h)
143146

CREDITS

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ but many others have contributed code and feedback, including
1717
Vernon Austel (IBM, T.J. Watson Research Center)
1818
Satish Balay @balay (Argonne National Laboratory)
1919
Matthew Brett @matthew-brett (University of Birmingham)
20+
Jérémie du Boisberranger @jeremiedbb
2021
Jed Brown @jedbrown (Argonne National Laboratory)
2122
Robin Christ @robinchrist
2223
Mat Cross @matcross (NAG)
@@ -35,7 +36,7 @@ but many others have contributed code and feedback, including
3536
Ali Emre Gülcü @Lephar
3637
Jeff Hammond @jeffhammond (Intel)
3738
Jacob Gorm Hansen @jacobgorm
38-
Jérémie du Boisberranger @jeremiedbb
39+
Shivaprashanth H (Global Edge)
3940
Jean-Michel Hautbois @jhautbois
4041
Ian Henriksen @insertinterestingnamehere (The University of Texas at Austin)
4142
Minh Quan Ho @hominhquan
@@ -52,6 +53,7 @@ but many others have contributed code and feedback, including
5253
Tze Meng Low (The University of Texas at Austin)
5354
Ye Luo @ye-luo (Argonne National Laboratory)
5455
Ricardo Magana @magania (Hewlett Packard Enterprise)
56+
Giorgos Margaritis
5557
Bryan Marker @bamarker (The University of Texas at Austin)
5658
Simon Lukas Märtens @ACSimon33 (RWTH Aachen University)
5759
Devin Matthews @devinamatthews (The University of Texas at Austin)
@@ -89,6 +91,7 @@ but many others have contributed code and feedback, including
8991
Kiran Varaganti @kvaragan (AMD)
9092
Natalia Vassilieva (Hewlett Packard Enterprise)
9193
Zhang Xianyi @xianyi (Chinese Academy of Sciences)
94+
RuQing Xu @xrq-phys (The University of Tokyo)
9295
Benda Xu @heroxbd
9396
Costas Yamin @cosstas
9497
Chenhan Yu @ChenhanYu (The University of Texas at Austin)

0 commit comments

Comments
 (0)