Skip to content

Commit 7dc8a76

Browse files
martin-frbgmartin-frbg
authored
Merge pull request #2293 from martin-frbg/pr2288
Add support for NetBSD by adding it to the existing xBSD conditionals
2 parents aeabe0a + 1b90989 commit 7dc8a76

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

‎driver/others/memory.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
129129
#include <unistd.h>
130130
#endif
131131

132-
#if defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_DRAGONFLY) || defined(OS_DARWIN)
132+
#if defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_NETBSD) || defined(OS_DRAGONFLY) || defined(OS_DARWIN)
133133
#include <sys/sysctl.h>
134134
#include <sys/resource.h>
135135
#endif
@@ -192,7 +192,7 @@ void goto_set_num_threads(int num_threads) {};
192192

193193
#else
194194

195-
#if defined(OS_LINUX) || defined(OS_SUNOS) || defined(OS_NETBSD)
195+
#if defined(OS_LINUX) || defined(OS_SUNOS)
196196
#ifndef NO_AFFINITY
197197
int get_num_procs(void);
198198
#else
@@ -312,7 +312,7 @@ int get_num_procs(void) {
312312

313313
#endif
314314

315-
#if defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_DRAGONFLY)
315+
#if defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_NETBSD) || defined(OS_DRAGONFLY)
316316

317317
int get_num_procs(void) {
318318

@@ -404,15 +404,15 @@ extern int openblas_goto_num_threads_env();
404404
extern int openblas_omp_num_threads_env();
405405

406406
int blas_get_cpu_number(void){
407-
#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_DRAGONFLY) || defined(OS_DARWIN) || defined(OS_ANDROID)
407+
#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_NETBSD) || defined(OS_DRAGONFLY) || defined(OS_DARWIN) || defined(OS_ANDROID)
408408
int max_num;
409409
#endif
410410
int blas_goto_num = 0;
411411
int blas_omp_num = 0;
412412

413413
if (blas_num_threads) return blas_num_threads;
414414

415-
#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_DRAGONFLY) || defined(OS_DARWIN) || defined(OS_ANDROID)
415+
#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_NETBSD) || defined(OS_DRAGONFLY) || defined(OS_DARWIN) || defined(OS_ANDROID)
416416
max_num = get_num_procs();
417417
#endif
418418

@@ -436,7 +436,7 @@ int blas_get_cpu_number(void){
436436
else if (blas_omp_num > 0) blas_num_threads = blas_omp_num;
437437
else blas_num_threads = MAX_CPU_NUMBER;
438438

439-
#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_DRAGONFLY) || defined(OS_DARWIN) || defined(OS_ANDROID)
439+
#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_NETBSD) || defined(OS_DRAGONFLY) || defined(OS_DARWIN) || defined(OS_ANDROID)
440440
if (blas_num_threads > max_num) blas_num_threads = max_num;
441441
#endif
442442

@@ -1673,7 +1673,7 @@ void gotoblas_dummy_for_PGI(void) {
16731673
#include <sys/resource.h>
16741674
#endif
16751675

1676-
#if defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_DRAGONFLY) || defined(OS_DARWIN)
1676+
#if defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_NETBSD) || defined(OS_DRAGONFLY) || defined(OS_DARWIN)
16771677
#include <sys/sysctl.h>
16781678
#include <sys/resource.h>
16791679
#endif
@@ -1736,7 +1736,7 @@ void goto_set_num_threads(int num_threads) {};
17361736

17371737
#else
17381738

1739-
#if defined(OS_LINUX) || defined(OS_SUNOS) || defined(OS_NETBSD)
1739+
#if defined(OS_LINUX) || defined(OS_SUNOS)
17401740
#ifndef NO_AFFINITY
17411741
int get_num_procs(void);
17421742
#else
@@ -1855,7 +1855,7 @@ int get_num_procs(void) {
18551855

18561856
#endif
18571857

1858-
#if defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_DRAGONFLY)
1858+
#if defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_NETBSD) || defined(OS_DRAGONFLY)
18591859

18601860
int get_num_procs(void) {
18611861

@@ -1945,15 +1945,15 @@ extern int openblas_goto_num_threads_env();
19451945
extern int openblas_omp_num_threads_env();
19461946

19471947
int blas_get_cpu_number(void){
1948-
#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_DRAGONFLY) || defined(OS_DARWIN) || defined(OS_ANDROID)
1948+
#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_NETBSD) || defined(OS_DRAGONFLY) || defined(OS_DARWIN) || defined(OS_ANDROID)
19491949
int max_num;
19501950
#endif
19511951
int blas_goto_num = 0;
19521952
int blas_omp_num = 0;
19531953

19541954
if (blas_num_threads) return blas_num_threads;
19551955

1956-
#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_DRAGONFLY) || defined(OS_DARWIN) || defined(OS_ANDROID)
1956+
#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_NETBSD) || defined(OS_DRAGONFLY) || defined(OS_DARWIN) || defined(OS_ANDROID)
19571957
max_num = get_num_procs();
19581958
#endif
19591959

@@ -1977,7 +1977,7 @@ int blas_get_cpu_number(void){
19771977
else if (blas_omp_num > 0) blas_num_threads = blas_omp_num;
19781978
else blas_num_threads = MAX_CPU_NUMBER;
19791979

1980-
#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_DRAGONFLY) || defined(OS_DARWIN) || defined(OS_ANDROID)
1980+
#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_NETBSD) || defined(OS_DRAGONFLY) || defined(OS_DARWIN) || defined(OS_ANDROID)
19811981
if (blas_num_threads > max_num) blas_num_threads = max_num;
19821982
#endif
19831983

‎getarch.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8282
#ifdef OS_WINDOWS
8383
#include <windows.h>
8484
#endif
85-
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
85+
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__APPLE__)
8686
#include <sys/types.h>
8787
#include <sys/sysctl.h>
8888
#endif
@@ -1201,7 +1201,7 @@ static int get_num_cores(void) {
12011201

12021202
#ifdef OS_WINDOWS
12031203
SYSTEM_INFO sysinfo;
1204-
#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
1204+
#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__APPLE__)
12051205
int m[2], count;
12061206
size_t len;
12071207
#endif
@@ -1215,7 +1215,7 @@ static int get_num_cores(void) {
12151215
GetSystemInfo(&sysinfo);
12161216
return sysinfo.dwNumberOfProcessors;
12171217

1218-
#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
1218+
#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__APPLE__)
12191219
m[0] = CTL_HW;
12201220
m[1] = HW_NCPU;
12211221
len = sizeof(int);

0 commit comments

Comments
 (0)