Update small changes

ulrikeyang · Jan 30, 2019 · 9a51ad8 · 9a51ad8
1 parent c6d0a0d
commit 9a51ad8
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 52 deletions.
diff --git a/E4S-Build-Tree.png b/E4S-Build-Tree.png
diff --git a/ECP-ST-CAR.tex b/ECP-ST-CAR.tex
@@ -295,6 +295,7 @@ \section*{Acknowledgments}
 %% APPENDIX
 %%---------------------------------------------------------------------------%%
 % The ECP ST CAR Appendix is kept in a private repo.  It must be cloned/forked and be side-by-side with the ECP-ST-CAR-PUBLIC repo if the following line is uncommented.
-%\input{../ECP-ST-CAR-APPENDIX/appendix}
+
+\input{../ECP-ST-CAR-APPENDIX/appendix}
 
 \end{document}
diff --git a/Introduction.tex b/Introduction.tex
diff --git a/projects/2.3.1-PMR/2.3.1.14-UPCxx-GASNet/2.3.1.14-UPCxx.tex b/projects/2.3.1-PMR/2.3.1.14-UPCxx-GASNet/2.3.1.14-UPCxx.tex
@@ -130,7 +130,7 @@ \subsubsection{\stid{1.14} UPC++}
 %  \subfloat[Cori Haswell\label{fig:dht-haswell-wait}]{ \includegraphics{projects/2.3.1-PMR/2.3.1.14-UPCxx-GASNet/all-cori-haswell-out-inserts-wait.png} }
 %  \subfloat[Cori KNL\label{fig:dht-knl-wait}]{}
       \includegraphics{projects/2.3.1-PMR/2.3.1.14-UPCxx-GASNet/all-cori-knl-out-inserts-wait.png}
-  \caption{Weak scaling of distributed hash table insertion on the KNL partition of NERSC's Cori platform. The dotted line represents the processes in one node.\vspace{-.4cm}}
+  \caption{Weak scaling of distributed hash table insertion on the KNL partition of NERSC's Cori platform. The dotted line represents the processes in one node.}
   \label{fig:dht}
 \end{figure}
 

diff --git a/projects/2.3.5-Ecosystem/2.3.5-Ecosystem.tex b/projects/2.3.5-Ecosystem/2.3.5-Ecosystem.tex
@@ -1,4 +1,4 @@
-\subsection{\stid{5} \ecosystem}
+\subsection{\stid{5} \ecosystem}\label{subsect:ecosystem}
 
 \textbf{End State:} A production-ready software stack delivered to our facilities, vendor partners, and the open source HPC community.
 

diff --git a/projects/2.3.5-Ecosystem/2.3.5.01-Ecosystem-SDK/2.3.5.01-Ecosystem-SDK.tex b/projects/2.3.5-Ecosystem/2.3.5.01-Ecosystem-SDK/2.3.5.01-Ecosystem-SDK.tex
@@ -43,17 +43,17 @@ \subsubsection{\stid{5.01} Software Development Kits} \label{subsubsect:ecosyste
 \begin{figure}[htb]
         \centering
         \includegraphics[width=6.5in]{projects/2.3.5-Ecosystem/2.3.5.01-Ecosystem-SDK/SDKdefinition1}
-        \caption{\label{fig:sdk-definition1}The above graphic shows the breakdown of ECP ST products into 6 SDKs and an Ecosystem group that will also be delivered as part of E4S. The colors denoted in the key map all of the ST products to the ST technical area they are part of.}
+        \caption{\label{fig:sdk-definition1}The above graphic shows the breakdown of ECP ST products into 6 SDKs ( the first six columns).  The rightmost column lists products that are not part of an SDK, but are part of Ecosystem group that will also be delivered as part of E4S. The colors denoted in the key map all of the ST products to the ST technical area they are part of.  For example, the xSDK consists of products that are in the Math Libraries Technical area, plus TuckerMPI which is in the Ecosystem and Delivery technical area.}
 \end{figure}
 
 \paragraph{Next Steps}
 Current and near-term efforts include:
 
 \begin{itemize}
-\item  defining community policies for E4S.
-\item  assisting with E4S deployment to computing facilities.
-\item  adding additional ST software to E4S for inclusion in the version 0.2 release.
-\item  beginning SDK-specific community policy discussions within newly formed SDK communities.
-\item  testing new ECP-funded continuous integration capability.
+\item  Defining community policies for E4S.
+\item  Assisting with E4S deployment to computing facilities.
+\item  Adding additional ST software to E4S for inclusion in the version 0.2 release.
+\item  Beginning SDK-specific community policy discussions within newly formed SDK communities.
+\item  Testing new ECP-funded continuous integration capability.
 \end{itemize}
 
diff --git a/references.bib b/references.bib
@@ -35,3 +35,9 @@ @Article{FFTW05
 	pages =	 {216--231},
 	note =	 {Special issue on ``Program Generation, Optimization, and Platform Adaptation''}
 }
+@misc{413.3B,
+  author = "Paul Basco",
+ title = {{DOE Order 413.3B: Program and Project Management (PM) for the Acquisition of Capital Assets, Significant Changes to the Order}},
+ url = {https://www.energy.gov/sites/prod/files/maprod/documents/15-1025_Bosco.pdf},
+ note = {\url{https://www.energy.gov/sites/prod/files/maprod/documents/15-1025_Bosco.pdf}}
+}