diff --git a/DESCRIPTION b/DESCRIPTION index 28a9b57..055ccfe 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: HIBAG Type: Package Title: HLA Genotype Imputation with Attribute Bagging -Version: 1.38.0 -Date: 2023-10-09 +Version: 1.38.1 +Date: 2023-12-12 Depends: R (>= 3.2.0) Imports: methods, RcppParallel Suggests: parallel, ggplot2, reshape2, gdsfmt, SNPRelate, SeqArray, knitr, diff --git a/NEWS b/NEWS index 94242bd..1e22a4b 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,10 @@ -CHANGES IN VERSION 1.38.0 +CHANGES IN VERSION 1.38.1 ------------------------- o fix a compiler warning of "unused-but-set-variable" on Apple ARM chips + o fix the failure of package loading on Apple ARM chips in the R console + CHANGES IN VERSION 1.36.3 ------------------------- diff --git a/src/HIBAG.cpp b/src/HIBAG.cpp index e96667d..57dfcfb 100755 --- a/src/HIBAG.cpp +++ b/src/HIBAG.cpp @@ -1409,7 +1409,11 @@ SEXP HIBAG_Kernel_Version() // using Intel TBB or not #if RCPP_PARALLEL_USE_TBB +#if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__)) + int ntot = 1; +#else int ntot = tbb::this_task_arena::max_concurrency(); +#endif SET_ELEMENT(ans, 2, ScalarInteger(ntot)); #else SET_ELEMENT(ans, 2, ScalarInteger(NA_INTEGER));