Skip to content

Commit

Permalink
Merge pull request #2 from amd/dev
Browse files Browse the repository at this point in the history
Merge for AOCL 3.0 release.
  • Loading branch information
dzambare authored Mar 16, 2021
2 parents 32365b3 + 3c3160f commit 2728fc8
Show file tree
Hide file tree
Showing 531 changed files with 98,078 additions and 9,678 deletions.
8 changes: 4 additions & 4 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -9683,7 +9683,7 @@ Date: Fri Feb 23 17:42:48 2018 -0600

CHANGELOG update (0.3.0)

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

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

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

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

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

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

Expand Down
13 changes: 8 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

cmake_minimum_required(VERSION 3.0.0)

project(AOCL-LibBlis-Win C)
project(AOCL-LibBlis-Win-MT C)

set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
if (MSVC)
set(TARGET_ARCH zen2)
set(TARGET_ARCH zen3)
message(STATUS "Setting MSVC flags2")
message(${TARGET_ARCH})
option(BUILD_SHARED_LIBS "Build shared library" ON)
Expand Down Expand Up @@ -99,6 +99,7 @@ include_directories(${CMAKE_SOURCE_DIR}/frame/2/trsv)
include_directories(${CMAKE_SOURCE_DIR}/frame/3)
include_directories(${CMAKE_SOURCE_DIR}/frame/3/gemm)
include_directories(${CMAKE_SOURCE_DIR}/frame/3/gemm/ind)
include_directories(${CMAKE_SOURCE_DIR}/frame/3/gemmt)
include_directories(${CMAKE_SOURCE_DIR}/frame/3/hemm)
include_directories(${CMAKE_SOURCE_DIR}/frame/3/her2k)
include_directories(${CMAKE_SOURCE_DIR}/frame/3/herk)
Expand Down Expand Up @@ -129,15 +130,17 @@ include_directories(${CMAKE_SOURCE_DIR}/kernels)
include_directories(${CMAKE_SOURCE_DIR}/kernels/haswell)
include_directories(${CMAKE_SOURCE_DIR}/kernels/haswell/3)
include_directories(${CMAKE_SOURCE_DIR}/kernels/haswell/3/sup)
include_directories(${CMAKE_SOURCE_DIR}/kernels/haswell/3/sup/d6x8)
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen)
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen/1)
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen/1f)
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen/1m)
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen/2)
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen/3)
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen/3/sup)
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen2)
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen2/1f)
include_directories(${CMAKE_SOURCE_DIR}/kernels/zen2/2)
#include_directories(${CMAKE_SOURCE_DIR}/kernels/zen2)
#include_directories(${CMAKE_SOURCE_DIR}/kernels/zen2/1f)
#include_directories(${CMAKE_SOURCE_DIR}/kernels/zen2/2)

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

Expand Down
5 changes: 4 additions & 1 deletion CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ but many others have contributed code and feedback, including
Vernon Austel (IBM, T.J. Watson Research Center)
Satish Balay @balay (Argonne National Laboratory)
Matthew Brett @matthew-brett (University of Birmingham)
Jérémie du Boisberranger @jeremiedbb
Jed Brown @jedbrown (Argonne National Laboratory)
Robin Christ @robinchrist
Mat Cross @matcross (NAG)
Expand All @@ -35,7 +36,7 @@ but many others have contributed code and feedback, including
Ali Emre Gülcü @Lephar
Jeff Hammond @jeffhammond (Intel)
Jacob Gorm Hansen @jacobgorm
Jérémie du Boisberranger @jeremiedbb
Shivaprashanth H (Global Edge)
Jean-Michel Hautbois @jhautbois
Ian Henriksen @insertinterestingnamehere (The University of Texas at Austin)
Minh Quan Ho @hominhquan
Expand All @@ -52,6 +53,7 @@ but many others have contributed code and feedback, including
Tze Meng Low (The University of Texas at Austin)
Ye Luo @ye-luo (Argonne National Laboratory)
Ricardo Magana @magania (Hewlett Packard Enterprise)
Giorgos Margaritis
Bryan Marker @bamarker (The University of Texas at Austin)
Simon Lukas Märtens @ACSimon33 (RWTH Aachen University)
Devin Matthews @devinamatthews (The University of Texas at Austin)
Expand Down Expand Up @@ -89,6 +91,7 @@ but many others have contributed code and feedback, including
Kiran Varaganti @kvaragan (AMD)
Natalia Vassilieva (Hewlett Packard Enterprise)
Zhang Xianyi @xianyi (Chinese Academy of Sciences)
RuQing Xu @xrq-phys (The University of Tokyo)
Benda Xu @heroxbd
Costas Yamin @cosstas
Chenhan Yu @ChenhanYu (The University of Texas at Austin)
Expand Down
Loading

0 comments on commit 2728fc8

Please sign in to comment.