Skip to content

Commit 00a1bfb

Browse files
committed
Merge dev branch into master for release 0.2.0
Merge for release tag v0.2.0 TEST_CHECKPATCH_ALLOW_FAILURE=yes
2 parents 6b237f6 + a8c532c commit 00a1bfb

File tree

201 files changed

+22620
-10044
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+22620
-10044
lines changed

.github/CONTRIBUTING.md

Lines changed: 0 additions & 143 deletions
This file was deleted.

.gitignore

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
clocal.m4
1+
aclocal.m4
22
autom4te.cache
33
build
44
config.*
@@ -48,16 +48,39 @@ log
4848

4949
# project files
5050
server/src/unifycrd
51+
util/unifycr/src/unifycr
5152

5253
# generated package files
5354
client/unifycr-config
5455
client/unifycr.pc
56+
extras/unifycr.conf
57+
libtool
58+
m4/libtool.m4
59+
m4/ltoptions.m4
60+
m4/ltsugar.m4
61+
m4/ltversion.m4
62+
m4/lt~obsolete.m4
63+
meta/src/Mlog2/.dirstamp
64+
t/sys/.dirstamp
5565

5666
# test files
57-
client/tests/test_read_gotcha
58-
client/tests/test_read_static
59-
client/tests/test_write_gotcha
60-
client/tests/test_write_static
67+
client/unifycr-runtime-config.h
68+
examples/src/app-btio-gotcha
69+
examples/src/app-btio-static
70+
examples/src/app-mpiio-gotcha
71+
examples/src/app-mpiio-static
72+
examples/src/sysio-read-gotcha
73+
examples/src/sysio-read-static
74+
examples/src/app-tileio-gotcha
75+
examples/src/app-tileio-static
76+
examples/src/sysio-write-gotcha
77+
examples/src/sysio-write-static
78+
examples/src/sysio-writeread-gotcha
79+
examples/src/sysio-writeread-static
80+
examples/src/sysio-writeread2-gotcha
81+
examples/src/sysio-writeread2-static
82+
examples/src/app-hdf5-create-gotcha
83+
examples/src/app-hdf5-writeread-gotcha
6184
t/sys/open.t
6285
t/test-results/
6386
t/unifycr_unmount.t

.travis.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,24 @@ before_install:
66
# MPI projects.
77
- test -n $CC && unset CC
88
- sudo apt-get -qq update
9-
- sudo apt-get install --yes -qq build-essential autoconf libtool
9+
- sudo apt-get install --yes -qq build-essential autoconf libtool cmake
1010
- sudo apt-get install --yes -qq libopenmpi-dev openmpi-bin
11+
- sudo apt-get install --yes -qq libhdf5-openmpi-dev
1112
- (cd $HOME/spack; git describe) || git clone https://github.com/spack/spack $HOME/spack
12-
- $HOME/spack/bin/spack install leveldb
13-
- $HOME/spack/bin/spack install gotcha
1413
- $HOME/spack/bin/spack install environment-modules
14+
- $HOME/spack/bin/spack install leveldb
15+
- $HOME/spack/bin/spack install [email protected]
16+
- $HOME/spack/bin/spack install flatcc
17+
# insall margo with spack
18+
- git config --global http.sslVerify false
19+
- git clone https://xgitlab.cels.anl.gov/sds/sds-repo.git $HOME/sds-repo.git
20+
- $HOME/spack/bin/spack repo add $HOME/sds-repo.git
21+
- $HOME/spack/bin/spack install margo
22+
- git config --global http.sslVerify true
23+
# prepare build environment
1524
- . $HOME/spack/share/spack/setup-env.sh
1625
- spack load environment-modules
17-
- source <(spack module loads gotcha leveldb)
26+
- source <(spack module tcl loads leveldb gotcha@0.0.2 flatcc mercury argobots margo)
1827
- eval $(./scripts/git_log_test_env.sh)
1928
- export TEST_CHECKPATCH_SKIP_FILES
2029

@@ -29,7 +38,9 @@ before_cache:
2938
script:
3039
# Force git to update the shallow clone and include tags so git-describe works
3140
- git fetch --unshallow --tags
32-
- sh autogen.sh && ./configure && make -k && make distcheck
41+
- sh autogen.sh
42+
- ./configure || cat config.log
43+
- make -k && make distcheck
3344
- ./scripts/checkpatch.sh || test "$TEST_CHECKPATCH_ALLOW_FAILURE" = yes
3445

3546
after_failure:

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SUBDIRS = meta server client t
1+
SUBDIRS = common meta server client examples extras t util
22

33
CONFIG = ordered
44

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,17 @@ scalable metadata indexing, co-located I/O delegation, and server-side read
1717
clustering and pipelining.
1818

1919
## Documentation
20-
Full UnifyCR documentation is contained [here](http://unifycr.readthedocs.io).
20+
Full UnifyCR documentation is contained [here](https://unifycr.readthedocs.io).
2121

22-
Use [Build & I/O Interception](http://unifycr.readthedocs.io/en/latest/build-intercept.html)
22+
Use [Build & I/O Interception](http://unifycr.readthedocs.io/en/dev/build-intercept.html)
2323
for instructions on how to build and install UnifyCR.
2424

2525
## Build Status
2626
The current status of the UnifyCR dev branch is:
2727

2828
[![Build Status](https://api.travis-ci.org/LLNL/UnifyCR.png?branch=dev)](https://travis-ci.org/LLNL/UnifyCR)
29+
[![Read the Docs](https://readthedocs.org/projects/unifycr/badge/?version=dev)](https://unifycr.readthedocs.io)
2930

3031
## Contribute and Develop
31-
We have a separate document with
32-
[contribution guidelines](./.github/CONTRIBUTING.md).
32+
Contributing guidelines can be found in our
33+
[documentation](https://unifycr.readthedocs.io/en/dev/style-guides.html).

client/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SUBDIRS = src tests
1+
SUBDIRS = src
22

33
bin_SCRIPTS = unifycr-config
44

client/check_fns/README.md

Lines changed: 3 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -12,50 +12,6 @@ They are also used to generate the code required for GOTCHA.
1212
- unifycr_list.txt - list of wrappers in UnifyCR
1313
- unifycr_unsupported_list.txt - list of wrappers in UnifyCR that implemented, but not supported
1414

15-
# Running the unifycr_check_fns tool
16-
17-
This tool identifies the set of I/O calls used in an application by running nm on the executable.
18-
It reports any I/O routines used by the app, which are not supported by UnifyCR.
19-
If an application uses an I/O routine that is not supported, it likely cannot use UnifyCR.
20-
If the tool does not report unsupported wrappers,
21-
the app may work with UnifyCR but it is not guaranteed to work.
22-
23-
unifycr_check_fns <executable>
24-
25-
# Building the GOTCHA list
26-
27-
The gotcha_map_unifycr_list.h file contains the code necessary to wrap I/O functions with GOTCHA.
28-
This is generated from the unifycr_list.txt file by running the following command:
29-
30-
python unifycr_translate.py unifycr_list
31-
32-
# Commands to build files
33-
34-
## fakechroot_list.txt
35-
The fakechroot_list.txt file lists I/O routines implemented in fakechroot.
36-
This list was generated using the following commands:
37-
38-
git clone https://github.com/fakechroot/fakechroot.git fakechroot.git
39-
cd fakechroot.git/src
40-
ls *.c > fakechroot_list.txt
41-
42-
## gnulibc_list.txt
43-
The gnulibc_list.txt file lists I/O routines available in libc.
44-
This list was writte by hand using information from
45-
[http://www.gnu.org/software/libc/manual/html_node/I_002fO-Overview.html#I_002fO-Overview](http://www.gnu.org/software/libc/manual/html_node/I_002fO-Overview.html#I_002fO-Overview).
46-
47-
## cstdio_list.txt
48-
The cstdio_list.txt file lists I/O routines available in libstdio..
49-
This list was written by hand using information from
50-
[http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1124.pdf](http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1124.pdf).
51-
52-
## unifycr_list.txt
53-
The unifycr_list.txt file specifies the set of wrappers in UnifyCR.
54-
Most but not all such wrappers are supported.
55-
The command to build unifycr list:
56-
57-
grep UNIFYCR_WRAP ../src/*.c > unifycr_list.txt
58-
59-
## unifycr_unsupported_list.txt
60-
The unify_unsupported_list.txt file specifies wrappers that are in UnifyCR, but are known to not actually be supported.
61-
This list is written by hand.
15+
Our [Wrapper Guide](https://unifycr.readthedocs.io/en/dev/wrappers.html)
16+
has the full documentation on running the unifycr_check_fns tool, building the
17+
GOTCHA list, and building the other .txt files here.

0 commit comments

Comments
 (0)