D-Net
/
dnet-hadoop
14
5
Fork 11
Code Issues 14 Pull Requests 12 Projects 2 Releases 2 Wiki Activity

master #59

Closed
claudio.atzori wants to merge 3221 commits from master into stable_ids
pull from: master
merge into: D-Net:stable_ids
Conversation 0 Commits 3221 Files Changed 2141 +28 -9
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 58665a246c - Show all commits

2
dhp-workflows/dhp-dedup-openaire/src/main/resources/eu/dnetlib/dhp/oa/dedup/consistency/oozie_app/workflow.xml
View File

@ -95,7 +95,7 @@
--conf spark.sql.shuffle.partitions=15000 --conf spark.sql.shuffle.partitions=15000
</spark-opts> </spark-opts>
<arg>--graphBasePath</arg><arg>${graphBasePath}</arg> <arg>--graphBasePath</arg><arg>${graphBasePath}</arg>
<arg>--outputPath</arg><arg>${workingPath}/propagaterelation/</arg> <arg>--graphOutputPath</arg><arg>${workingPath}/propagaterelation/</arg>
<arg>--workingPath</arg><arg>${workingPath}</arg> <arg>--workingPath</arg><arg>${workingPath}</arg>
</spark> </spark>
<ok to="CleanRelation"/> <ok to="CleanRelation"/>

35
dhp-workflows/dhp-impact-indicators/src/main/resources/eu/dnetlib/dhp/oa/graph/impact_indicators/oozie_app/workflow.xml
View File

@ -9,6 +9,26 @@
<name>oozie.action.sharelib.for.spark</name> <name>oozie.action.sharelib.for.spark</name>
<value>${oozieActionShareLibForSpark2}</value> <value>${oozieActionShareLibForSpark2}</value>
</property> </property>
<property>
<name>projectImpactIndicatorsOutput</name>
<value>${nameNode}${workingDir}/project_indicators</value>
</property>
<property>
<name>openaireGraphInputPath</name>
<value>${nameNode}/${workingDir}/openaire_id_graph</value>
</property>
<property>
<name>synonymFolder</name>
<value>${nameNode}/${workingDir}/openaireid_to_dois/</value>
</property>
<property>
<name>checkpointDir</name>
<value>${nameNode}/${workingDir}/check/</value>
</property>
<property>
<name>bipScorePath</name>
<value>${nameNode}${workingDir}/openaire_universe_scores/</value>
</property>
</configuration> </configuration>
</global> </global>
@ -65,9 +85,8 @@
<!-- number of partitions to be used on joins --> <!-- number of partitions to be used on joins -->
<arg>${sparkShufflePartitions}</arg> <arg>${sparkShufflePartitions}</arg>
<!-- The output of the graph should be the openaire input graph for ranking--> <!-- The output of the graph should be the openaire input graph for ranking-->
<arg>${openaireGraphInputPath}</arg> <arg>${nameNode}${workingDir}/openaire_id_graph</arg>
<file>${nameNode}${wfAppPath}/create_openaire_ranking_graph.py#create_openaire_ranking_graph.py</file>
<file>${wfAppPath}/create_openaire_ranking_graph.py#create_openaire_ranking_graph.py</file>
</spark> </spark>
<ok to="non-iterative-rankings" /> <ok to="non-iterative-rankings" />
@ -103,7 +122,7 @@
</spark-opts> </spark-opts>
<!-- Script arguments here --> <!-- Script arguments here -->
<arg>${openaireGraphInputPath}</arg> <arg>${nameNode}/${workingDir}/openaire_id_graph</arg>
<!-- number of partitions to be used on joins --> <!-- number of partitions to be used on joins -->
<arg>${sparkShufflePartitions}</arg> <arg>${sparkShufflePartitions}</arg>
@ -136,7 +155,7 @@
</spark-opts> </spark-opts>
<!-- Script arguments here --> <!-- Script arguments here -->
<arg>${openaireGraphInputPath}</arg> <arg>${nameNode}/${workingDir}/openaire_id_graph</arg>
<arg>${ramGamma}</arg> <arg>${ramGamma}</arg>
<arg>${currentYear}</arg> <arg>${currentYear}</arg>
<arg>RAM</arg> <arg>RAM</arg>
@ -174,7 +193,7 @@
</spark-opts> </spark-opts>
<!-- Script arguments here --> <!-- Script arguments here -->
<arg>${openaireGraphInputPath}</arg> <arg>${nameNode}/${workingDir}/openaire_id_graph</arg>
<!-- number of partitions to be used on joins --> <!-- number of partitions to be used on joins -->
<arg>${sparkShufflePartitions}</arg> <arg>${sparkShufflePartitions}</arg>
<arg>3</arg> <arg>3</arg>
@ -207,7 +226,7 @@
</spark-opts> </spark-opts>
<!-- Script arguments here --> <!-- Script arguments here -->
<arg>${openaireGraphInputPath}</arg> <arg>${nameNode}/${workingDir}/openaire_id_graph</arg>
<arg>${pageRankAlpha}</arg> <arg>${pageRankAlpha}</arg>
<arg>${convergenceError}</arg> <arg>${convergenceError}</arg>
<arg>${checkpointDir}</arg> <arg>${checkpointDir}</arg>
@ -243,7 +262,7 @@
</spark-opts> </spark-opts>
<!-- Script arguments here --> <!-- Script arguments here -->
<arg>${openaireGraphInputPath}</arg> <arg>${nameNode}/${workingDir}/openaire_id_graph</arg>
<arg>${attrankAlpha}</arg> <arg>${attrankAlpha}</arg>
<arg>${attrankBeta}</arg> <arg>${attrankBeta}</arg>
<arg>${attrankGamma}</arg> <arg>${attrankGamma}</arg>