minor
This commit is contained in:
parent
5934950ce2
commit
7b59dcb8b8
4
Makefile
4
Makefile
@ -3,7 +3,7 @@ export CXX = g++
|
|||||||
endif
|
endif
|
||||||
export MPICXX = mpicxx
|
export MPICXX = mpicxx
|
||||||
export LDFLAGS= -Llib -lrt
|
export LDFLAGS= -Llib -lrt
|
||||||
export WARNFLAGS= -Wall -Wextra -Wno-unused-parameter -Wno-unknown-pragmas
|
export WARNFLAGS= -Wall -Wextra -Wno-unused-parameter -Wno-unknown-pragmas -std=c++0x
|
||||||
export CFLAGS = -O3 -msse2 $(WARNFLAGS)
|
export CFLAGS = -O3 -msse2 $(WARNFLAGS)
|
||||||
|
|
||||||
ifndef WITH_FPIC
|
ifndef WITH_FPIC
|
||||||
@ -72,5 +72,5 @@ doc doxygen:
|
|||||||
cd include; doxygen ../doc/Doxyfile; cd -
|
cd include; doxygen ../doc/Doxyfile; cd -
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(RM) $(OBJ) $(MPIOBJ) $(ALIB) $(MPIALIB) *~ src/*~ include/*~ include/*/*~ wrapper/*~
|
$(RM) $(OBJ) $(MPIOBJ) $(ALIB) $(MPIALIB) $(SLIB) *~ src/*~ include/*~ include/*/*~ wrapper/*~
|
||||||
|
|
||||||
|
|||||||
14
doc/conf.py
14
doc/conf.py
@ -38,6 +38,7 @@ source_parsers = {
|
|||||||
}
|
}
|
||||||
# Version information.
|
# Version information.
|
||||||
import rabit
|
import rabit
|
||||||
|
|
||||||
version = rabit.__version__
|
version = rabit.__version__
|
||||||
release = rabit.__version__
|
release = rabit.__version__
|
||||||
|
|
||||||
@ -148,11 +149,24 @@ def run_doxygen(folder):
|
|||||||
except OSError as e:
|
except OSError as e:
|
||||||
sys.stderr.write("doxygen execution failed: %s" % e)
|
sys.stderr.write("doxygen execution failed: %s" % e)
|
||||||
|
|
||||||
|
|
||||||
|
def run_build_lib(folder):
|
||||||
|
"""Run the doxygen make command in the designated folder."""
|
||||||
|
try:
|
||||||
|
retcode = subprocess.call("cd %s; make" % folder, shell=True)
|
||||||
|
if retcode < 0:
|
||||||
|
sys.stderr.write("build terminated by signal %s" % (-retcode))
|
||||||
|
except OSError as e:
|
||||||
|
sys.stderr.write("build execution failed: %s" % e)
|
||||||
|
|
||||||
|
|
||||||
def generate_doxygen_xml(app):
|
def generate_doxygen_xml(app):
|
||||||
"""Run the doxygen make commands if we're on the ReadTheDocs server"""
|
"""Run the doxygen make commands if we're on the ReadTheDocs server"""
|
||||||
read_the_docs_build = os.environ.get('READTHEDOCS', None) == 'True'
|
read_the_docs_build = os.environ.get('READTHEDOCS', None) == 'True'
|
||||||
if read_the_docs_build:
|
if read_the_docs_build:
|
||||||
run_doxygen('..')
|
run_doxygen('..')
|
||||||
|
run_build_lib('..')
|
||||||
|
rabit._loadlib()
|
||||||
|
|
||||||
def setup(app):
|
def setup(app):
|
||||||
# Add hook for building doxygen xml when needed
|
# Add hook for building doxygen xml when needed
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user