Skip to content

Commit e3bd773

Browse files
committed
Try CI without added openmp for macos
1 parent b1158c8 commit e3bd773

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

.github/workflows/ci.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,25 @@ jobs:
3131
with:
3232
dev_version: 'TRUE'
3333

34-
- name: OpenMP for macOS
35-
if: ${{ matrix.os == 'macos-latest' }}
36-
run: |
37-
curl -fsSL https://raw.githubusercontent.com/coatless-shell/openmp/main/install-openmp.sh | bash -s -- --yes
38-
mkdir -p ~/.R
39-
cat <<EOF > ~/.R/Makevars
40-
CPPFLAGS += -Xclang -fopenmp
41-
LDFLAGS += -lomp
42-
EOF
34+
# - name: OpenMP for macOS
35+
# if: ${{ matrix.os == 'macos-latest' }}
36+
# run: |
37+
# curl -fsSL https://raw.githubusercontent.com/coatless-shell/openmp/main/install-openmp.sh | bash -s -- --yes
38+
# mkdir -p ~/.R
39+
# cat <<EOF > ~/.R/Makevars
40+
# CPPFLAGS += -Xclang -fopenmp
41+
# LDFLAGS += -lomp
42+
# EOF
4343

44-
- name: Show config on macOS
45-
if: ${{ matrix.os == 'macos-latest' }}
46-
run: |
47-
cat ~/.R/Makevars
48-
echo -n "R CMD config CXX: "; R CMD config CXX
49-
echo -n "R CMD config CPPFLAGS: "; R CMD config CPPFLAGS
50-
echo -n "R CMD config LDFLAGS: "; R CMD config LDFLAGS
51-
echo -n "R CMD config SHLIB_CXXLD: "; R CMD config SHLIB_CXXLD
52-
echo -n "R CMD config SHLIB_CXXLDFLAGS: "; R CMD config SHLIB_CXXLDFLAGS
44+
# - name: Show config on macOS
45+
# if: ${{ matrix.os == 'macos-latest' }}
46+
# run: |
47+
# cat ~/.R/Makevars
48+
# echo -n "R CMD config CXX: "; R CMD config CXX
49+
# echo -n "R CMD config CPPFLAGS: "; R CMD config CPPFLAGS
50+
# echo -n "R CMD config LDFLAGS: "; R CMD config LDFLAGS
51+
# echo -n "R CMD config SHLIB_CXXLD: "; R CMD config SHLIB_CXXLD
52+
# echo -n "R CMD config SHLIB_CXXLDFLAGS: "; R CMD config SHLIB_CXXLDFLAGS
5353

5454
- name: Run configure
5555
run: ./configure; cat src/Makevars

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ if [ "${R_OPENMP_ENABLED}" = "0" ]; then
117117
sed -e "s|@OPENMP_FLAG@||" src/Makevars.in > src/Makevars
118118
sed -e "s|@ARMA_HAVE_OPENMP@|ARMA_DONT_USE_OPENMP 1|" inst/include/RcppArmadillo/config/RcppArmadilloConfigGenerated.h.in > inst/include/RcppArmadillo/config/RcppArmadilloConfigGenerated.h
119119
else
120-
sed -e "s|@OPENMP_FLAG@|\$(SHLIB_OPENMP_CFLAGS)|" src/Makevars.in > src/Makevars
120+
sed -e "s|@OPENMP_FLAG@|\$(SHLIB_OPENMP_CXXFLAGS)|" src/Makevars.in > src/Makevars
121121
sed -e "s|@ARMA_HAVE_OPENMP@|ARMA_USE_OPENMP 1|" inst/include/RcppArmadillo/config/RcppArmadilloConfigGenerated.h.in > inst/include/RcppArmadillo/config/RcppArmadilloConfigGenerated.h
122122
fi
123123

0 commit comments

Comments
 (0)