Skip to content

Commit

Permalink
Merge pull request #594 from ThePortlandGroup/nv_stage
Browse files Browse the repository at this point in the history
Pull 2018-09-21T05-56 Recent NVIDIA Changes
  • Loading branch information
sscalpone authored Sep 21, 2018
2 parents 36782ba + b4a498a commit 498be06
Show file tree
Hide file tree
Showing 57 changed files with 4,287 additions and 3,611 deletions.
1 change: 1 addition & 0 deletions runtime/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ add_definitions(
-DPGFLANG
-DNATIVE_FPCVT
-DPGI_LITTLE_ENDIAN
-DINLINE_MEMOPS
)

if( ${TARGET_ARCHITECTURE} STREQUAL "x86_64" )
Expand Down
10 changes: 5 additions & 5 deletions runtime/flang/mmcmplx16.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2012-2018, NVIDIA CORPORATION. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -539,19 +539,19 @@ void ENTF90(MMUL_CMPLX16,
tindex -= 2;
switch (tindex) {
case 0:
ftn_mnaxnb_cmplx16_(&ta, &tb, &mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
ftn_mnaxnb_cmplx16_(&mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
beta, c, &ldc);
break;
case 1:
ftn_mtaxnb_cmplx16_(&ta, &tb, &mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
ftn_mtaxnb_cmplx16_(&mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
beta, c, &ldc);
break;
case 2:
ftn_mnaxtb_cmplx16_(&ta, &tb, &mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
ftn_mnaxtb_cmplx16_(&mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
beta, c, &ldc);
break;
case 3:
ftn_mtaxtb_cmplx16_(&ta, &tb, &mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
ftn_mtaxtb_cmplx16_(&mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
beta, c, &ldc);
}
}
Expand Down
10 changes: 5 additions & 5 deletions runtime/flang/mmcmplx8.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2012-2018, NVIDIA CORPORATION. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -538,19 +538,19 @@ void ENTF90(MMUL_CMPLX8,
tindex -= 2;
switch (tindex) {
case 0:
ftn_mnaxnb_cmplx8_(&ta, &tb, &mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
ftn_mnaxnb_cmplx8_(&mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
beta, c, &ldc);
break;
case 1:
ftn_mtaxnb_cmplx8_(&ta, &tb, &mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
ftn_mtaxnb_cmplx8_(&mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
beta, c, &ldc);
break;
case 2:
ftn_mnaxtb_cmplx8_(&ta, &tb, &mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
ftn_mnaxtb_cmplx8_(&mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
beta, c, &ldc);
break;
case 3:
ftn_mtaxtb_cmplx8_(&ta, &tb, &mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
ftn_mtaxtb_cmplx8_(&mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
beta, c, &ldc);
}
}
Expand Down
Loading

0 comments on commit 498be06

Please sign in to comment.