Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove lpsolve files from external #183

Merged
merged 14 commits into from
Oct 8, 2021
Merged

Remove lpsolve files from external #183

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
55b4851
remove lpsolve from external
vaithak Oct 6, 2021
78ddb81
minor newline changes and add Wno-deprecated-declarations
vaithak Oct 7, 2021
fa571bc
minor newline changes
vaithak Oct 7, 2021
3a319e6
fix README
vaithak Oct 7, 2021
9387871
README whitespace fix
vaithak Oct 7, 2021
75f8a3d
final fix
vaithak Oct 7, 2021
699ad46
minor change
vaithak Oct 7, 2021
1eb1d63
fix deprecated error in ubuntu latest
vaithak Oct 7, 2021
adc1db1
upgrade lpSolveAPI version
vaithak Oct 7, 2021
d1f3acc
fix ftime deprecation
vaithak Oct 7, 2021
c8890d9
fix ftime deprecation
vaithak Oct 7, 2021
23aecbf
final fix
vaithak Oct 7, 2021
c2ef618
fix comments
vaithak Oct 8, 2021
6cfe427
removed auto format changes
vaithak Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/R-CMD-check-macOS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macOS-latest, r: '3.6'}
# - {os: macOS-latest, r: 'devel'} # Error in library(devtools) : there is no package called ‘devtools’
- {os: macOS-latest, r: 'release'}
- { os: macOS-latest, r: "3.6" }
# - {os: macOS-latest, r: 'devel'} # Error in library(devtools) : there is no package called ‘devtools’
- { os: macOS-latest, r: "release" }

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
Expand All @@ -39,15 +39,15 @@ jobs:
- uses: r-lib/actions/setup-pandoc@master

- name: Install dependencies
run: Rscript -e "install.packages(c('devtools', dependencies=TRUE))" -e "install.packages(c('rcmdcheck', 'devtools', 'Rcpp', 'RcppEigen', 'BH', 'testthat'))";
run: Rscript -e "install.packages(c('devtools', dependencies=TRUE))" -e "install.packages(c('rcmdcheck', 'devtools', 'Rcpp', 'RcppEigen', 'BH', 'testthat', 'downloader', 'xfun'))";

- name: Check
env:
_R_CHECK_CRAN_INCOMING_REMOTE_: false
run: cd cran_gen/;
Rscript genCRANpkg.R;
cd cran_package;
Rscript -e "library(rcmdcheck)" -e "rcmdcheck::rcmdcheck(args = c('--no-manual'), error_on = 'warning', check_dir = 'check')"
Rscript genCRANpkg.R;
cd cran_package;
Rscript -e "library(rcmdcheck)" -e "rcmdcheck::rcmdcheck(args = c('--no-manual'), error_on = 'warning', check_dir = 'check')"

- name: Upload check results
if: failure()
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/R-CMD-check-ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
fail-fast: false
matrix:
config:
- {os: ubuntu-latest, r: 'devel'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-18.04, r: 'devel'}
- {os: ubuntu-18.04, r: 'release'}
- { os: ubuntu-latest, r: "devel" }
- { os: ubuntu-latest, r: "release" }
- { os: ubuntu-18.04, r: "devel" }
- { os: ubuntu-18.04, r: "release" }

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
Expand All @@ -33,7 +33,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: sudo apt-get update || true;
sudo apt install build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev;
sudo apt install build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev;

- uses: r-lib/actions/setup-r@master
with:
Expand All @@ -42,15 +42,15 @@ jobs:
- uses: r-lib/actions/setup-pandoc@master

- name: Install dependencies
run: Rscript -e "install.packages(c('devtools', dependencies=TRUE))" -e "install.packages(c('rcmdcheck', 'devtools', 'Rcpp', 'RcppEigen', 'BH', 'testthat'))";
run: Rscript -e "install.packages(c('devtools', dependencies=TRUE))" -e "install.packages(c('rcmdcheck', 'devtools', 'Rcpp', 'RcppEigen', 'BH', 'testthat', 'downloader', 'xfun'))";

- name: Check
env:
_R_CHECK_CRAN_INCOMING_REMOTE_: false
run: cd cran_gen/;
Rscript genCRANpkg.R;
cd cran_package;
Rscript -e "library(rcmdcheck)" -e "rcmdcheck::rcmdcheck(args = c('--no-manual'), error_on = 'warning', check_dir = 'check')"
Rscript genCRANpkg.R;
cd cran_package;
Rscript -e "library(rcmdcheck)" -e "rcmdcheck::rcmdcheck(args = c('--no-manual'), error_on = 'warning', check_dir = 'check')"

- name: Upload check results
if: failure()
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/R-CMD-check-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
fail-fast: false
matrix:
config:
# - {os: windows-latest, r: 'devel'} # Error in library(devtools) : there is no package called ‘devtools’
- {os: windows-latest, r: 'release'}
# - {os: windows-latest, r: 'devel'} # Error in library(devtools) : there is no package called ‘devtools’
- { os: windows-latest, r: "release" }

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
Expand All @@ -38,15 +38,15 @@ jobs:
- uses: r-lib/actions/setup-pandoc@master

- name: Install dependencies
run: Rscript -e "install.packages(c('devtools', dependencies=TRUE))" -e "install.packages(c('rcmdcheck', 'devtools', 'Rcpp', 'RcppEigen', 'BH', 'testthat'))"
run: Rscript -e "install.packages(c('devtools', dependencies=TRUE))" -e "install.packages(c('rcmdcheck', 'devtools', 'Rcpp', 'RcppEigen', 'BH', 'testthat', 'downloader', 'xfun'))"

- name: Check
env:
_R_CHECK_CRAN_INCOMING_REMOTE_: false
run: cd cran_gen/;
Rscript genCRANpkg.R;
cd cran_package;
Rscript -e "library(rcmdcheck)" -e "rcmdcheck::rcmdcheck(args = c('--no-manual'), error_on = 'warning', check_dir = 'check')"
Rscript genCRANpkg.R;
cd cran_package;
Rscript -e "library(rcmdcheck)" -e "rcmdcheck::rcmdcheck(args = c('--no-manual'), error_on = 'warning', check_dir = 'check')"

- name: Upload check results
if: failure()
Expand Down
2 changes: 1 addition & 1 deletion R-proj/src/Makevars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PKG_CPPFLAGS= -I../../external/boost -I../../external/LPsolve_src/run_headers -I../../external/minimum_ellipsoid -I../../include

PKG_CXXFLAGS= -lm -ldl -Wno-ignored-attributes -DBOOST_NO_AUTO_PTR -DDISABLE_NLP_ORACLES
PKG_CXXFLAGS= -Wno-deprecated-declarations -lm -ldl -Wno-ignored-attributes -DBOOST_NO_AUTO_PTR -DDISABLE_NLP_ORACLES

CXX_STD = CXX11

Expand Down
2 changes: 1 addition & 1 deletion R-proj/src/Makevars.win
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_CPPFLAGS=-I../../external/boost -I../../external/LPsolve_src/run_headers -I../../external/minimum_ellipsoid -I../../include -I../../include/convex_bodies/spectrahedra
PKG_CXXFLAGS= -lm -ldl -Wno-ignored-attributes -DBOOST_NO_AUTO_PTR -DDISABLE_NLP_ORACLES
PKG_CXXFLAGS= -Wno-deprecated-declarations -lm -ldl -Wno-ignored-attributes -DBOOST_NO_AUTO_PTR -DDISABLE_NLP_ORACLES
CXX_STD = CXX11

PKG_LIBS=-LRproj_externals/lp_solve -llp_solve $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
Expand Down
25 changes: 0 additions & 25 deletions R-proj/src/Rproj_externals/lp_solve/Makefile
View file
Open in desktop

This file was deleted.

Loading