Compare commits
	
		
			2 Commits
		
	
	
		
			1c56367446
			...
			f0afa10462
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| f0afa10462 | |||
| 92f8904b21 | 
| @ -1,6 +1,5 @@ | |||||||
| { stdenv | { stdenv | ||||||
| , fetchurl | , fetchurl | ||||||
| , ncurses |  | ||||||
| , lib | , lib | ||||||
| , dpkg | , dpkg | ||||||
| , rsync | , rsync | ||||||
| @ -10,12 +9,9 @@ | |||||||
| , hwloc | , hwloc | ||||||
| , zlib | , zlib | ||||||
| , autoPatchelfHook | , autoPatchelfHook | ||||||
| , symlinkJoin |  | ||||||
| , libfabric | , libfabric | ||||||
| , gcc13 | , gcc13 | ||||||
| , gcc7 |  | ||||||
| , wrapCCWith | , wrapCCWith | ||||||
| , linuxHeaders |  | ||||||
| }: | }: | ||||||
| 
 | 
 | ||||||
| # The distribution of intel packages is a mess. We are doing the installation | # The distribution of intel packages is a mess. We are doing the installation | ||||||
| @ -30,6 +26,8 @@ | |||||||
| 
 | 
 | ||||||
| let | let | ||||||
| 
 | 
 | ||||||
|  |   gcc = gcc13; | ||||||
|  | 
 | ||||||
|   v = { |   v = { | ||||||
|     hpckit   = "2023.1.0"; |     hpckit   = "2023.1.0"; | ||||||
|     compiler = "2023.1.0"; |     compiler = "2023.1.0"; | ||||||
| @ -413,7 +411,7 @@ let | |||||||
| 
 | 
 | ||||||
|   icx-wrapper = wrapIntel rec { |   icx-wrapper = wrapIntel rec { | ||||||
|     cc = intel-compiler; |     cc = intel-compiler; | ||||||
|     mygcc = gcc13; |     mygcc = gcc; | ||||||
|     extraBuild = '' |     extraBuild = '' | ||||||
|       wrap icx  $wrapper $ccPath/icx |       wrap icx  $wrapper $ccPath/icx | ||||||
|       wrap icpx $wrapper $ccPath/icpx |       wrap icpx $wrapper $ccPath/icpx | ||||||
| @ -432,7 +430,7 @@ let | |||||||
|     # Intel icc classic compiler tries to behave like the gcc found in $PATH. |     # Intel icc classic compiler tries to behave like the gcc found in $PATH. | ||||||
|     # EVEN if it doesn't support some of the features. See: |     # EVEN if it doesn't support some of the features. See: | ||||||
|     # https://community.intel.com/t5/Intel-C-Compiler/builtin-shuffle-GCC-compatibility-and-has-builtin/td-p/1143619 |     # https://community.intel.com/t5/Intel-C-Compiler/builtin-shuffle-GCC-compatibility-and-has-builtin/td-p/1143619 | ||||||
|     mygcc = gcc13; |     mygcc = gcc; | ||||||
|     extraBuild = '' |     extraBuild = '' | ||||||
|       wrap icc  $wrapper $ccPath/icc |       wrap icc  $wrapper $ccPath/icc | ||||||
|       wrap icpc $wrapper $ccPath/icpc |       wrap icpc $wrapper $ccPath/icpc | ||||||
| @ -446,7 +444,7 @@ let | |||||||
| 
 | 
 | ||||||
|   ifort-wrapper = wrapIntel rec { |   ifort-wrapper = wrapIntel rec { | ||||||
|     cc = intel-compiler-fortran; |     cc = intel-compiler-fortran; | ||||||
|     mygcc = gcc13; |     mygcc = gcc; | ||||||
|     extraBuild = '' |     extraBuild = '' | ||||||
|       wrap ifort  $wrapper $ccPath/ifort |       wrap ifort  $wrapper $ccPath/ifort | ||||||
|     ''; |     ''; | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user