mirror of
https://github.com/nasa/trick.git
synced 2024-12-19 05:07:54 +00:00
9099792947
* Provide MonteCarloGenerate capability
Intermediate commit, this squash represents all of Isaac Reaves' work
during his Fall 2022 Pathways internship tour
[skip ci]
* TrickOps: Add phase, [min-max] range, and overhaul YAML verification
* Add new "phase:" mechanism to TrickOps Runs and Builds to support
project-specific constraints on build and run ordering
- phase defaults to zero if not specified and must be between -1000
and 1000 if given.
- jobs can now optionally be requested by their phase or phase range
- See trickops/README.md for details
* Add [min-max] notation capability to run: entries and compare: entries
- [min-max] ranges provide definition of a set of runs using a common
numbering scheme in the YAML file, greatly reducing YAML file size
for monte-carlo and other zero-padded run numbering use cases
- See trickops/README.md for details
* YAML parsing changes
- Overhaul the logic which verifies YAML files for the expected
TrickOps format. This is now done in TrickWorkflowYamlVerifier and
provides much more robust error checking than previous approach
- .yaml_requirements.yml now provides the required types, ranges, and
default values as applicable to expected entries in YAML files
- valgrind: is now an sub-option to run: entries, not its own section
Users should now list their runs normallly and define their flags in
in that run's valgrind: subsection
- parallel_safety is now a per-sim parameter and not global. Users
should move their global config to the sim layer
- self.config_errors is now a list of errors. Users should now
check for empty list when using instead of True/False
* Robustify the get_koviz_report_jobs unit test to work whether koviz
exists on PATH or not
* Adjust trickops.py to use the new phase and range features
- Make it more configurable on the command-line via argparse
- Move SIM_mc_generation tests into test_sims.yml
[skip ci]
* Code review and cleanup from PR #1389
Documentation:
* Adjust documentation to fit suggested symlinked approach. Also
cleaned up duplicate images and old documentation.
* Moved the verification section out of markdown and into a PDF since it
heavily leverages formatting not available in markdown.
* Clarify a couple points on the Darwin Trick install guide
* Update wiki to clarify that data recording strings is not supported
MCG Code:
* Replace MonteCarloVariableRandomNormal::is_near_equal with new
Trick::dbl_is_near from trick team
MCG Testing:
* Reduce the set of SIM_mc_generation comparisons. After discussion
the trick team, we are choosing to remove all comparisons to
verif_data/ which contain random-generated numbers since
these tests cannot pass across all supported trick platforms.
* Fix the wrong rule on exlcuding -Werror for Darwin builds
of SIM_mc_generation
* Remove data recording of strings in SIM_mc_generation
Trickops:
* Replace build_command with build_args per discussion w/ Trick team
Since we only support arguments to trick-CP, replace the build_command
yaml entry with build_args
* Disable var server connection by default in SingleRun if TrickWorkflow.quiet
is True
* Guard against multiple Job starts
* Remove SimulationJob inheritance layer since old monte-carlo wasn't
and never will be supported by TrickOps
* Ignore IOError raise from variable_server that looks like "The remote
endpoint has closed the connection". This appears to occur when
SingleRun jobs attempt to connect to the var server for a sim that
terminates very early
[skip ci]
* Adjust phasing of old/new MCG initialize functions
* Clarify failure message in generate_dispersions if new/old MC are both
used.
* Adjust the phasing order of MCG intialize method to be before
legacy MC initialized. Without this, monte-carlo dry run completes with
success before the check in generate_dispersions() can run
* Add -Wno-stringop-truncation to S_override.mk for SIM_mc_generation
since gcc 8+ warns about SWIG generated content in top.cpp
* Introduce MonteCarloGenerationHelper python class
This new class provides an easy-to-use interface for MCG sim-module
users:
1. Run generation
2. Getting an sbatch array job suitable for SLURM
3. Getting a list of SingleRun() instances for generated runs, to be
executed locally if desired
---------
Co-authored-by: Dan Jordan <daniel.d.jordan@nasa.gov>
104 lines
2.6 KiB
Makefile
104 lines
2.6 KiB
Makefile
TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../..)
|
|
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
|
|
|
ifneq ($(HDF5),)
|
|
TRICK_CXXFLAGS += -DHDF5
|
|
endif
|
|
|
|
TRICK_LIB = $(TRICK_LIB_DIR)/libtrick_pyip.a
|
|
|
|
OBJECT_FILES = \
|
|
$(OBJ_DIR)/PrimitiveAttributesMap.o \
|
|
$(OBJ_DIR)/swig_convert_units.o \
|
|
$(OBJ_DIR)/swig_global_vars.o
|
|
|
|
SWIG_OBJECT_FILES = \
|
|
$(OBJ_DIR)/sim_services_wrap.o \
|
|
$(OBJ_DIR)/swig_double_wrap.o \
|
|
$(OBJ_DIR)/swig_int_wrap.o \
|
|
$(OBJ_DIR)/swig_ref_wrap.o
|
|
|
|
PY_FILES = \
|
|
${TRICK_HOME}/share/trick/swig/sim_services.py \
|
|
${TRICK_HOME}/share/trick/swig/swig_double.py \
|
|
${TRICK_HOME}/share/trick/swig/swig_int.py \
|
|
${TRICK_HOME}/share/trick/swig/swig_ref.py
|
|
|
|
SWIG_SRC_FILES = $(addprefix swig_${TRICK_HOST_CPU}/, $(notdir $(subst .o,.cpp,$(SWIG_OBJECT_FILES))))
|
|
TRICK_CXXFLAGS += $(PYTHON_INCLUDES) -Wno-redundant-decls -Wno-shadow -Wno-unused-parameter -Wno-missing-field-initializers -std=c++11
|
|
|
|
ifeq ($(IS_CC_CLANG), 1)
|
|
TRICK_CXXFLAGS += -Wno-self-assign -Wno-sometimes-uninitialized
|
|
endif
|
|
|
|
TEST_DIR = swig_${TRICK_HOST_CPU}_test
|
|
|
|
ifneq ($(HDF5),)
|
|
SWIG_DEFS += -DHDF5
|
|
ifneq ($(HDF5),/usr)
|
|
TRICK_CXXFLAGS += -I$(HDF5)/include
|
|
endif
|
|
endif
|
|
|
|
ifneq ($(GSL_HOME),)
|
|
SWIG_DEFS += -D_HAVE_GSL
|
|
endif
|
|
|
|
ifeq ($(USE_ER7_UTILS), 1)
|
|
SWIG_DEFS += -DUSE_ER7_UTILS_INTEGRATORS
|
|
endif
|
|
|
|
ifeq ($(USE_ER7_UTILS_CHECKPOINTHELPER), 1)
|
|
SWIG_DEFS += -DUSE_ER7_UTILS_CHECKPOINTHELPER
|
|
endif
|
|
|
|
ifeq ($(USE_CIVETWEB), 1)
|
|
SWIG_DEFS += -DUSE_CIVETWEB
|
|
endif
|
|
|
|
default: $(SWIG_OBJECT_FILES) $(TRICK_LIB) $(TEST_DIR)
|
|
|
|
trick: $(SWIG_OBJECT_FILES) $(OBJECT_FILES) $(TEST_DIR)
|
|
|
|
$(OBJ_DIR):
|
|
mkdir $@
|
|
|
|
$(TEST_DIR): swig_${TRICK_HOST_CPU}
|
|
ln -s -f $< $@
|
|
|
|
$(SWIG_OBJECT_FILES): | $(OBJ_DIR)
|
|
|
|
$(SWIG_SRC_FILES): | swig_${TRICK_HOST_CPU}
|
|
|
|
swig_${TRICK_HOST_CPU}:
|
|
mkdir $@
|
|
|
|
$(SWIG_OBJECT_FILES): $(OBJ_DIR)/%.o : swig_${TRICK_HOST_CPU}/%.cpp
|
|
$(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c $< -o $@
|
|
|
|
$(OBJECT_FILES): $(OBJ_DIR)/%.o : %.cpp
|
|
$(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c $< -o $@
|
|
|
|
$(SWIG_SRC_FILES): swig_${TRICK_HOST_CPU}/%_wrap.cpp : %.i
|
|
$(SWIG) $(SWIG_DEFS) -I${TRICK_HOME}/trick_source -I${TRICK_HOME}/include -I${TRICK_HOME} -c++ -python -includeall -ignoremissing -w201,362,389,451 -o $@ -outdir ${TRICK_HOME}/share/trick/swig $<
|
|
|
|
$(TRICK_LIB) : $(SWIG_OBJECT_FILES) $(OBJECT_FILES)
|
|
ar crs $@ $?
|
|
|
|
real_clean: clean
|
|
|
|
clean: clean_python
|
|
$(RM) -rf $(OBJ_DIR) $(TEST_DIR) $(PY_FILES)
|
|
|
|
|
|
clean_python:
|
|
rm -rf swig_${TRICK_HOST_CPU} sim_services.py swig_double.py swig_int.py swig_ref.py
|
|
|
|
real_clean: clean
|
|
|
|
# some depends
|
|
swig_int_wrap.cpp: swig_int.cpp
|
|
swig_double_wrap.cpp: swig_double.cpp
|
|
swig_ref_wrap.cpp: swig_ref.cpp
|
|
|