Skip to content

Commit 7da983e

Browse files
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents 720654a + 986ba29 commit 7da983e

4 files changed

Lines changed: 10 additions & 2 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ e.g.:
251251

252252
### Support for multiple targets in a single library
253253

254-
OpenBLAS can be built for multiple targets with runtime detection of the target cpu by specifiying `DYNAMIC_ARCH=1` in Makefile.rule, on the gmake command line or as `-DDYNAMIC_ARCH=TRUE` in cmake.
254+
OpenBLAS can be built for multiple targets with runtime detection of the target cpu by specifying `DYNAMIC_ARCH=1` in Makefile.rule, on the gmake command line or as `-DDYNAMIC_ARCH=TRUE` in cmake.
255255

256256
For **x86_64**, the list of targets this activates contains Prescott, Core2, Nehalem, Barcelona, Sandybridge, Bulldozer, Piledriver, Steamroller, Excavator, Haswell, Zen, SkylakeX, Cooper Lake, Sapphire Rapids. For cpu generations not included in this list, the corresponding older model is used. If you also specify `DYNAMIC_OLDER=1`, specific support for Penryn, Dunnington, Opteron, Opteron/SSE3, Bobcat, Atom and Nano is added. Finally there is an option `DYNAMIC_LIST` that allows to specify an individual list of targets to include instead of the default.
257257

cpuid_x86.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,6 +1563,7 @@ int get_cpuname(void){
15631563
break;
15641564
case 11: //family 6 exmodel 11
15651565
switch (model) {
1566+
case 5: // Arrow Lake H/U
15661567
case 7: // Raptor Lake
15671568
case 10:
15681569
case 15:
@@ -1588,6 +1589,7 @@ int get_cpuname(void){
15881589
break;
15891590
case 15:
15901591
case 6: // Arrow Lake
1592+
case 5:
15911593
if(support_avx512())
15921594
return CPUTYPE_SAPPHIRERAPIDS;
15931595
if(support_avx2())
@@ -2418,6 +2420,7 @@ int get_coretype(void){
24182420

24192421
case 11:
24202422
switch (model) {
2423+
case 5: // Arrow Lake H/U
24212424
case 7: // Raptor Lake
24222425
case 10:
24232426
case 15:
@@ -2434,6 +2437,7 @@ int get_coretype(void){
24342437
}
24352438
case 12:
24362439
switch (model) {
2440+
case 5:
24372441
case 6: // Arrow Lake
24382442
if(support_amx_bf16())
24392443
return CORE_SAPPHIRERAPIDS;

docs/runtime_variables.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ OpenBLAS checks the following environment variables on startup:
3030
cache where it is not reported correctly (in virtual environments)
3131

3232

33-
Deprecated variables still recognized for compatibilty:
33+
Deprecated variables still recognized for compatibility:
3434

3535
* `GOTO_NUM_THREADS`: equivalent to `OPENBLAS_NUM_THREADS`
3636
* `GOTOBLAS_MAIN_FREE`: equivalent to `OPENBLAS_MAIN_FREE`

exports/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,15 @@ ifeq ($(F_COMPILER), INTEL)
162162
else
163163
ifeq ($(F_COMPILER), FLANG)
164164
$(FC) $(FFLAGS) $(LDFLAGS) -fno-fortran-main -Mnomain -all_load -headerpad_max_install_names -install_name "$(CURDIR)/../$(INTERNALNAME)" -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def $(FEXTRALIB)
165+
else
166+
ifeq ($(F_COMPILER), FLANGNEW)
167+
$(FC) $(FFLAGS) $(LDFLAGS) -Wl,-all_load -Wl,-headerpad_max_install_names -Wl,-install_name,"$(CURDIR)/../$(INTERNALNAME)" -Wl,-dylib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def $(FEXTRALIB)
165168
else
166169
$(FC) $(FFLAGS) $(LDFLAGS) -all_load -headerpad_max_install_names -install_name "$(CURDIR)/../$(INTERNALNAME)" -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def $(FEXTRALIB)
167170
endif
168171
endif
169172
endif
173+
endif
170174

171175
dllinit.$(SUFFIX) : dllinit.c
172176
$(CC) $(CFLAGS) -c -o $(@F) -s $<

0 commit comments

Comments
 (0)