Skip to content

Commit

Permalink
Remove lpsolve files from external (#183)
Browse files Browse the repository at this point in the history
* remove lpsolve from external

* minor newline changes and add Wno-deprecated-declarations

* minor newline changes

* fix README

* README whitespace fix

* final fix

* minor change

* fix deprecated error in ubuntu latest

* upgrade lpSolveAPI version

* fix ftime deprecation

* fix ftime deprecation

* final fix

* fix comments

* removed auto format changes
  • Loading branch information
vaithak authored Oct 8, 2021
1 parent 3f12d68 commit 54b5652
Show file tree
Hide file tree
Showing 84 changed files with 122 additions and 62,990 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check-macOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ 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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ 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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ 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:
Expand Down
2 changes: 1 addition & 1 deletion R-proj/src/Makevars
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
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

This file was deleted.

Loading

0 comments on commit 54b5652

Please sign in to comment.