Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions .github/julia/generate_binaries.jl
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ platforms = [
("x86_64-w64-mingw32-libgfortran5" , "bin", "dll" ),
]


for (platform, libdir, ext) in platforms

tarball_name = "$package.v$version.$platform.tar.gz"
Expand All @@ -50,15 +49,15 @@ for (platform, libdir, ext) in platforms

# Create a folder with the version number of the package
mkdir("$(package)_binaries.$version2")
for folder in ("share", "lib", "bin")
for folder in ("share", "bin")
cp(folder, "$(package)_binaries.$version2/$folder")
end

cd("$(package)_binaries.$version2")
if ext == "dll"
run(`zip -r --symlinks ../../../$(package)_binaries.$version2.$platform.zip share lib bin`)
run(`zip -r --symlinks ../../../$(package)_binaries.$version2.$platform.zip share bin`)
else
run(`tar -czf ../../../$(package)_binaries.$version2.$platform.tar.gz share lib bin`)
run(`tar -czf ../../../$(package)_binaries.$version2.$platform.tar.gz share bin`)
end
cd("../../..")

Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ A package to decode SIF optimization test examples for use by CUTEst and GALAHAD

### Precompiled library and executables

We provide a precompiled SIFDecode library and executables in the [releases tab](https://github.com/ralna/SIFDecode/releases/latest/) for Linux, macOS (Intel & Silicon) and Windows.
We provide precompiled SIFDecode executables in the [releases tab](https://github.com/ralna/SIFDecode/releases/latest/) for Linux (x64 and aarch64), macOS (x64 and aarch64), and Windows (x64).

### Installation from source

Expand All @@ -18,7 +18,6 @@ SIFDecode can be installed using the [Meson build system](https://mesonbuild.com
meson setup builddir
meson compile -C builddir
meson install -C builddir
meson test -C builddir
```

SIFDecode can also be installed via the "make" build system based on [ARCHDefs](https://github.com/ralna/ARCHDefs).
Expand All @@ -35,8 +34,9 @@ The test problems are classified according to the [CUTE classification scheme](h

## How to decode a SIF file

Since version `v2.7.0`, an executable binary of `sifdecoder` is
available and allows you to easily decode SIF files on any platform.
Since version `v3.0.0`, an executable binary `sifdecoder` is
available through the Meson build system and allows you to easily
decode SIF files on any platform.

```shell
sifdecoder -h # display the options
Expand All @@ -56,9 +56,9 @@ gfortran -O3 -c *.f # generate object files *.o
ar rcs libROSENBR.a *.o # static library on all platform
```

Since version `v2.7.0`, the executable binary `sifdecoder` accepts an option `-suffix`.
The executable `sifdecoder` accepts the option `-suffix`.
All generated files are then suffixed with the problem name and the precision,
allowing SIF files to be decoded in parallel within the same folder.
which allows SIF files to be decoded in parallel within the same folder.

A bash script [`sifdecoder`](https://github.com/ralna/SIFDecode/blob/master/bin/sifdecoder) can
also be used under the "make" build system with additional options but is less interoperable.
27 changes: 0 additions & 27 deletions install_modules.py

This file was deleted.

12 changes: 0 additions & 12 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,21 @@ project(
],
)

libsifdecode_src = []
sifdecode_binaries = []

# Sources
subdir('src/check')
subdir('src/decode')
subdir('src/select')

# Library
libsifdecode = library('sifdecode',
sources : libsifdecode_src,
install : true)

# Binaries
foreach binary: sifdecode_binaries
binname = binary[0]
binfile = binary[1]
executable(binname,
sources : binfile,
link_with : libsifdecode,
install : true)
endforeach

# Fortran modules
script_modules = files('install_modules.py')
meson.add_install_script(script_modules)

# Install sifdecoder man page
install_data(
'man/man1/sifdecoder_standalone.1',
Expand Down
2 changes: 0 additions & 2 deletions src/check/meson.build

This file was deleted.

5 changes: 2 additions & 3 deletions src/decode/meson.build
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
libsifdecode_src += files('sifdecode.f90', 'sifdecoder_standalone.f90')
sifdecode_binaries += [['sifdecoder', files('sifdecoder_standalone_main.f90')]]
# sifdecode_binaries += [['run_sifdecode', files('sifdecode_main.f90')]]
sifdecode_binaries += [['sifdecoder', files('sifdecode.f90', 'sifdecoder_standalone.f90', 'sifdecoder_standalone_main.f90')]]
# sifdecode_binaries += [['run_sifdecode', files('sifdecode.f90', 'sifdecode_main.f90')]]
Loading