Skip to content

Commit

Permalink
Merge branch 'devel' into wangc/LOGOS_plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
@wangcj05
wangcj05 committed May 4, 2020
2 parents 07a4036 + 779ce69 commit 8657c8f
Show file tree
Hide file tree
Showing 392 changed files with 48,554 additions and 28,250 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
[submodule "plugins/LOGOS"]
path = plugins/LOGOS
url = [email protected]:RAVEN_PLUGINS/LOGOS.git
[submodule "plugins/SRAW"]
path = plugins/SRAW
url = [email protected]:RAVEN_PLUGINS/SRAW.git
15 changes: 12 additions & 3 deletions dependencies.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ matplotlib = 3.1.1
statsmodels = 0.9.0
cloudpickle = 1.1.1
tensorflow = 1.13.1
python
python = 3
hdf5
swig
pylint
Expand All @@ -56,13 +56,12 @@ pyside2

# tertiary installs directly from pip
[pip]
lazy-import

# optional libraries
[optional]
pillow = 6.0.0

# operating system alterations
# operating system alterations (conda)
[windows]
# nothing currently

Expand All @@ -74,6 +73,16 @@ pillow = 6.0.0
nomkl
numexpr

# operating system alterations (pip)
[windows-pip]
# nothing currently

[mac-pip]
ray

[linux-pip]
ray

##### Alternate installs
# install using pip
[pip-install]
Expand Down
219 changes: 149 additions & 70 deletions developer_tools/XSDSchemas/Optimizers.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,99 +5,178 @@
<!-- *********************************************************************** -->
<xsd:complexType name="OptimizerData">
<xsd:sequence>
<xsd:element name="SPSA" type="SPSAOptimizer" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="FiniteDifference" type="SPSAOptimizer" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="ConjugateGradient" type="SPSAOptimizer" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="GradientDescent" type="GradientDescentOptimizer" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="SimulatedAnnealing" type="SimulatedAnnealingOptimizer" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="verbosity" type="verbosityAttr" default="all"/>
</xsd:complexType>

<xsd:complexType name="optVarType">
<xsd:complexContent>
<xsd:extension base="variableType">
<xsd:sequence>
<xsd:element name="initial" type="xsd:string" minOccurs="0"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>

<xsd:complexType name="optInitType">
<xsd:all>
<xsd:element name="limit" type="xsd:integer" minOccurs="0"/>
<xsd:element name="initialSeed" type="xsd:integer" minOccurs="0"/>
<xsd:element name="resample" type="RavenBool" minOccurs="0" maxOccurs="1"/>
<xsd:element name="type" type="xsd:string" minOccurs="0"/>
<xsd:element name="thresholdTrajRemoval" type="xsd:float" minOccurs="0"/>
<xsd:element name="writeSteps" type="xsd:string" minOccurs="0"/>
</xsd:all>
<xsd:all>
<xsd:element name="limit" type="xsd:string" minOccurs="0"/>
<xsd:element name="initialSeed" type="xsd:integer" minOccurs="0"/>
<xsd:element name="type" type="xsd:string" minOccurs="0"/>
<xsd:element name="writeSteps" type="xsd:string" minOccurs="0"/>
</xsd:all>
</xsd:complexType>

<xsd:complexType name="optVarType">
<xsd:complexType name="GradientEstimatorData">
<xsd:choice>
<xsd:element name="FiniteDifference" type="xsd:string" minOccurs="0" maxOccurs="1"/>
<xsd:element name="CentralDifference" type="xsd:string" minOccurs="0" maxOccurs="1"/>
<xsd:element name="SPSA" type="xsd:string" minOccurs="0" maxOccurs="1"/>
</xsd:choice>
</xsd:complexType>

<xsd:complexType name="StepManipulatorData">
<xsd:choice>
<xsd:element name="GradientHistory" type="GradientHistorySMType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="ConjugateGradient" type="xsd:string" minOccurs="0" maxOccurs="1"/>
</xsd:choice>
</xsd:complexType>

<xsd:complexType name="GradientHistorySMType">
<xsd:all>
<xsd:element name="upperBound" type="xsd:float" minOccurs="0"/>
<xsd:element name="lowerBound" type="xsd:float" minOccurs="0"/>
<xsd:element name="initial" type="xsd:string" minOccurs="0"/>
<xsd:element name="shape" type="xsd:string" minOccurs="0"/>
<xsd:element name="growthFactor" type="xsd:float" minOccurs="0" maxOccurs="1"/>
<xsd:element name="shrinkFactor" type="xsd:float" minOccurs="0" maxOccurs="1"/>
</xsd:all>
<xsd:attribute name="name" type="xsd:string" use="required"/>
<xsd:attribute name="shape" type="xsd:string"/>
<xsd:attribute name="verbosity" type="verbosityAttr" default="all"/>
</xsd:complexType>

<xsd:complexType name="optSubspaceType">
<xsd:complexType name="OptAcceptanceType">
<xsd:choice>
<xsd:element name="Strict" type="EmptyType" minOccurs="0" maxOccurs="1"/>
</xsd:choice>
</xsd:complexType>

<xsd:complexType name="EmptyType"/>

<xsd:complexType name="terminateFollowersType">
<xsd:simpleContent>
<xsd:extension base="xsd:string">
<xsd:attribute name="name" type="xsd:string" use="required"/>
<xsd:attribute name="precond" type="xsd:string"/>
<xsd:attribute name="holdOutputSpace" type="xsd:string" use="optional"/>
<xsd:attribute name="proximity" type="xsd:float" use="optional"/>
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>

<xsd:complexType name="optConvergenceType">
<xsd:all>
<xsd:element name="iterationLimit" type="xsd:integer" minOccurs="0" maxOccurs="1"/>
<xsd:element name="relativeThreshold" type="xsd:float" minOccurs="0" maxOccurs="1"/>
<xsd:element name="absoluteThreshold" type="xsd:float" minOccurs="0" maxOccurs="1"/>
<xsd:element name="gradientThreshold" type="xsd:float" minOccurs="0" maxOccurs="1"/>
<xsd:element name="gainGrowthFactor" type="xsd:float" minOccurs="0" maxOccurs="1"/>
<xsd:element name="gainShrinkFactor" type="xsd:float" minOccurs="0" maxOccurs="1"/>
<xsd:element name="minStepSize" type="xsd:float" minOccurs="0" maxOccurs="1"/>
<xsd:element name="persistence" type="xsd:float" minOccurs="0" maxOccurs="1"/>
<xsd:element name="centralDifference" type="RavenBool" minOccurs="0" maxOccurs="1"/>
<xsd:element name="useGradientHistory" type="RavenBool" minOccurs="0" maxOccurs="1"/>
</xsd:all>
</xsd:complexType>

<xsd:complexType name="SPSAOptimizer">
<xsd:complexType name="OptConvergenceType">
<xsd:all>
<xsd:element name="persistence" type="xsd:integer" minOccurs="0"/>
<xsd:element name="gradient" type="xsd:float" minOccurs="0"/>
<xsd:element name="objective" type="xsd:float" minOccurs="0"/>
<xsd:element name="stepSize" type="xsd:float" minOccurs="0"/>
<xsd:element name="terminateFollowers" type="terminateFollowersType" minOccurs="0"/>
</xsd:all>
</xsd:complexType>

<xsd:complexType name="SAConvergenceType">
<xsd:all>
<xsd:element name="persistence" type="xsd:integer" minOccurs="0"/>
<xsd:element name="objective" type="xsd:float" minOccurs="0"/>
<xsd:element name="temperature" type="xsd:float" minOccurs="0"/>
</xsd:all>
</xsd:complexType>

<!-- <xsd:complexType name="linearCoolingType">
<xsd:element name="beta" type="xsd:float"/>
</xsd:complexType> -->

<xsd:complexType name="exponentialCoolingType">
<xsd:all>
<xsd:element name="alpha" type="xsd:float"/>
</xsd:all>
</xsd:complexType>

<xsd:complexType name="boltzmanCoolingType">
<xsd:all>
<xsd:element name="d" type="xsd:float"/>
</xsd:all>
</xsd:complexType>

<xsd:complexType name="cauchyCoolingType">
<xsd:all>
<xsd:element name="d" type="xsd:float"/>
</xsd:all>
</xsd:complexType>

<!-- <xsd:complexType name="fastCoolingType">
<xsd:element name="c" type="xsd:float"/>
</xsd:complexType> -->

<xsd:complexType name="veryFastCoolingType">
<xsd:all>
<xsd:element name="c" type="xsd:float"/>
</xsd:all>
</xsd:complexType>

<xsd:complexType name="OptCoolingScheduleType">
<xsd:choice>
<!-- <xsd:element name="linear" type="linearCoolingType"/> -->
<xsd:element name="exponential" type="exponentialCoolingType"/>
<xsd:element name="cauchy" type="cauchyCoolingType"/>
<xsd:element name="boltzmann" type="boltzmanCoolingType"/>
<!-- <xsd:element name="fast" type="fastCoolingType"/> -->
<xsd:element name="veryfast" type="veryFastCoolingType"/>
</xsd:choice>
</xsd:complexType>

<xsd:complexType name="GradientDescentOptimizer">
<xsd:sequence>
<xsd:element name="initialization" type="optInitType" minOccurs="0"/>
<xsd:element name="Function" type="AssemblerObjectType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="TargetEvaluation" type="AssemblerObjectType" minOccurs="1" maxOccurs="1"/>
<xsd:element name="Sampler" type="AssemblerObjectType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="Preconditioner" type="AssemblerObjectType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="convergence" type="optConvergenceType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="variable" type="optVarType" minOccurs="1" maxOccurs='unbounded'/>
<xsd:element name="constant" minOccurs="0" maxOccurs='unbounded'>
<xsd:complexType mixed="true">
<xsd:attribute name="name" type="xsd:string" use="required"/>
<xsd:attribute name="shape" type="xsd:string"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="objectVar" type="xsd:string" minOccurs="1" maxOccurs="1"/>
<xsd:element name="parameter" minOccurs="0" maxOccurs="1">
<xsd:element name="objective" type="xsd:string" minOccurs="1" maxOccurs="1"/>
<xsd:element name="variable" type="optVarType" minOccurs="1" maxOccurs='unbounded'/>
<xsd:element name="TargetEvaluation" type="AssemblerObjectType" minOccurs="1" maxOccurs="1"/>
<xsd:element name="samplerInit" type="optInitType" minOccurs="0"/>
<xsd:element name="gradient" type="GradientEstimatorData" minOccurs="1" maxOccurs="1"/>
<xsd:element name="stepSize" type="StepManipulatorData" minOccurs="1" maxOccurs="1"/>
<xsd:element name="acceptance" type="OptAcceptanceType" minOccurs="1" maxOccurs="1"/>
<xsd:element name="convergence" type="OptConvergenceType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="constant" type="constantVarType" minOccurs="0" maxOccurs='unbounded'/>
<xsd:element name="ConstantSource" minOccurs="0" maxOccurs='unbounded'>
<xsd:complexType mixed="true">
<xsd:sequence>
<xsd:element name="numGradAvgIterations" type="xsd:integer" minOccurs="0" maxOccurs="1"/>
<xsd:element name="initialStepSize" type="xsd:float" minOccurs="0" maxOccurs="1"/>
<xsd:element name="perturbationDistance" type="xsd:float" minOccurs="0" maxOccurs="1"/>
<xsd:element name="innerBisectionThreshold" type="xsd:float" minOccurs="0" maxOccurs="1"/>
<xsd:element name="innerLoopLimit" type="xsd:float" minOccurs="0" maxOccurs="1"/>
<xsd:element name="stochasticDistribution" type="xsd:string" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>
<xsd:attribute name="class" type="xsd:string" use="required"/>
<xsd:attribute name="type" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="multilevel" minOccurs="0" maxOccurs="1">
<xsd:element name="Constraint" type="AssemblerObjectType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="Sampler" type="AssemblerObjectType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="Restart" type="AssemblerObjectType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="restartTolerance" type="xsd:float" minOccurs="0" maxOccurs="1"/>
<xsd:element name="variableTransformation" type="variablesTransformationType" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required"/>
<xsd:attribute name="verbosity" type="verbosityAttr"/>
</xsd:complexType>
<xsd:complexType name="SimulatedAnnealingOptimizer">
<xsd:sequence>
<xsd:element name="samplerInit" type="optInitType" minOccurs="0"/>
<xsd:element name="convergence" type="SAConvergenceType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="coolingSchedule" type="OptCoolingScheduleType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="variable" type="optVarType" minOccurs="1" maxOccurs='unbounded'/>
<xsd:element name="objective" type="xsd:string" minOccurs="1" maxOccurs="1"/>
<xsd:element name="TargetEvaluation" type="AssemblerObjectType" minOccurs="1" maxOccurs="1"/>
<xsd:element name="constant" type="constantVarType" minOccurs="0" maxOccurs='unbounded'/>
<xsd:element name="ConstantSource" minOccurs="0" maxOccurs='unbounded'>
<xsd:complexType mixed="true">
<xsd:sequence>
<xsd:element name="subspace" type="optSubspaceType" minOccurs="1" maxOccurs="unbounded"/>
<xsd:element name="sequence" type="xsd:string" minOccurs="1" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>
<xsd:attribute name="class" type="xsd:string" use="required"/>
<xsd:attribute name="type" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="Constraint" type="AssemblerObjectType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="Sampler" type="AssemblerObjectType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="Restart" type="AssemblerObjectType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="restartTolerance" type="xsd:float" minOccurs="0" maxOccurs="1"/>
<xsd:element name="variableTransformation" type="variablesTransformationType" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required"/>
<xsd:attribute name="verbosity" type="verbosityAttr"/>
</xsd:complexType>
</xsd:schema>
</xsd:schema>
Loading

0 comments on commit 8657c8f

Please sign in to comment.