Merge 453cbae into 4fa85e1

.travis.yml

@@ -4,10 +4,13 @@ os:
   - linux
   - osx
 
+arch:
+  - x64
+  - amd64
+  # - ppc64le
+  - arm64
+
 julia:
-  - 1.0
-  - 1.1
-  - 1.2
   - 1.3
   - nightly
 
@@ -26,17 +29,20 @@ branches:
 
 before_install:
   - if [ `uname` == "Linux" ]; then unset DY_LIBRARY_PATH; fi
-  - if [ `uname` == "Darwin" ]; then brew update; brew cask uninstall oclint; brew install gcc; brew tap optimizers/cutest; brew install cutest; brew install mastsif; for f in "archdefs" "sifdecode" "mastsif" "cutest"; do source $(brew --prefix $f)/$f.bashrc; done; fi
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
 
 jobs:
+  exclude:
+    - julia: nightly
+      arch: arm64
   include:
     - stage: Documentation
       julia: 1.3
       os: linux
       script:
+        - git clone https://bitbucket.org/optrove/sif.git deps/sif
         - julia --project=docs -e 'using Pkg; Pkg.instantiate(); Pkg.add(PackageSpec(path=pwd()))'
-        - julia --project=docs docs/make.jl
+        - export MASTSIF=$PWD/deps/sif; julia --project=docs docs/make.jl
       after_success: skip
 
 after_success:

Project.toml

@@ -3,24 +3,22 @@ uuid = "1b53aba6-35b6-5f92-a507-53c67d53f819"
 version = "0.7.0"
 
 [deps]
-BinDeps = "9e28174c-4ba2-5203-b857-d8d62c4213ee"
+CUTEst_jll = "bb5f6f25-f23d-57fd-8f90-3ef7bad1d825"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
-Homebrew = "d9be37ee-ecc9-5288-90f1-b9ca67657a75"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 NLPModels = "a4795742-8479-5a88-8948-cc11e1c8c1a6"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
-BinDeps = "0.8"
+CUTEst_jll = "^0.1.0"
 Combinatorics = "1.0"
 DataStructures = "0.17"
-Homebrew = "0.4, 0.5, 0.6, 0.7"
 JSON = "0.8, 0.9, 0.10, 0.11, 0.12, 0.13, 0.14, 0.15, 0.16, 0.17, 0.18, 0.19, 0.20, 0.21"
-Krylov = "0.4"
-NLPModels = "0.10, 1"
-julia = "^1.0.0"
+Krylov = "0.2.0, 0.3.0, 0.4.0"
+NLPModels = "0.10.0, 1"
+julia = "^1.3.0"
 
 [extras]
 Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"

README.md

@@ -21,24 +21,23 @@ comparing optimization algorithms, derived from the abstract model on
 
 ## Installing
 
-This package should detect your existing CUTEst installation, and will install its private version of CUTEst otherwise.
-The gfortran compiler is required.
-We currently do not support other Fortran compilers.
+This package will install CUTEst binaries for your platform automatically.
+The gfortran compiler is still required to compile decoded SIF problems.
+No other Fortran compiler is supported.
 
-On OSX, Homebrew.jl will install gfortran if gfortran is not detected on your system.
-You may either use standard Homebrew to install gfortran yourself from precompiled bottled using `brew install gcc` or let Homebrew.jl install its private version.
-In the latter scenario, gcc and gfortran need to be compiled from source.
-
-On Linux, you'll need to install `wget` and `gfortran`, and also make `libgfortran.so` visible by `julia`. See [this
-page](https://github.com/abelsiqueira/linux-cutest#requirements) for how to
-install the requirements on some linux distributions.
-
-The following commands download CUTEst, change to the specific
-branch, and build CUTEst.
+The following command installs the CUTEst binaries and Julia interface:
 ````JULIA
-julia> Pkg.add("CUTEst")
+pkg> add CUTEst
 ````
 
+If you already have a collection of SIF problems that you wish to use, you can simply set the `MASTSIF` environment variable to point to their location.
+If not, the command
+```julia
+julia> fetch_sif_problems()
+```
+will download the most recent version of the standard SIF collection and set `MASTSIF` appropriately.
+Subsequent calls to the same function will pull any updates to the SIF problems.
+
 ## Usage
 
 After installing, you can create instances of