From d1bab1c0497d8f7c8eb5e9171f5f88a53c237f8a Mon Sep 17 00:00:00 2001 From: Antonis Troumpoukis Date: Sat, 4 Dec 2021 00:43:16 +0200 Subject: [PATCH 1/6] use alpine --- examples/federator-fedx/fedx-init-all/Dockerfile | 2 +- examples/federator-fedx/fedx-init-all/init.sh | 2 +- examples/federator-fedx/fedx-init/Dockerfile | 2 +- examples/federator-fedx/fedx-init/init.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/federator-fedx/fedx-init-all/Dockerfile b/examples/federator-fedx/fedx-init-all/Dockerfile index a1f9d79b..3d60c0aa 100644 --- a/examples/federator-fedx/fedx-init-all/Dockerfile +++ b/examples/federator-fedx/fedx-init-all/Dockerfile @@ -1,4 +1,4 @@ -FROM xqdocker/ubuntu-openjdk:jdk-8 +FROM alpine:3.7 RUN mkdir /kobe-temp diff --git a/examples/federator-fedx/fedx-init-all/init.sh b/examples/federator-fedx/fedx-init-all/init.sh index b9fb9c4b..b0ea37dc 100644 --- a/examples/federator-fedx/fedx-init-all/init.sh +++ b/examples/federator-fedx/fedx-init-all/init.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh cd /kobe/input diff --git a/examples/federator-fedx/fedx-init/Dockerfile b/examples/federator-fedx/fedx-init/Dockerfile index be864c4d..5b4f9c1d 100644 --- a/examples/federator-fedx/fedx-init/Dockerfile +++ b/examples/federator-fedx/fedx-init/Dockerfile @@ -1,4 +1,4 @@ -FROM xqdocker/ubuntu-openjdk:jdk-8 +FROM alpine:3.7 RUN mkdir /sevod-scraper RUN mkdir /sevod-scraper/output diff --git a/examples/federator-fedx/fedx-init/init.sh b/examples/federator-fedx/fedx-init/init.sh index 77b7169e..e9640216 100755 --- a/examples/federator-fedx/fedx-init/init.sh +++ b/examples/federator-fedx/fedx-init/init.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh FNAME="/sevod-scraper/output/"$DATASET_NAME".nt" From 7b18e02826911bcd9b6a5cb725ae7c758f165da6 Mon Sep 17 00:00:00 2001 From: Antonis Troumpoukis Date: Sat, 4 Dec 2021 00:44:32 +0200 Subject: [PATCH 2/6] disable ASK queries --- examples/federator-fedx/fedx-init/init.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/federator-fedx/fedx-init/init.sh b/examples/federator-fedx/fedx-init/init.sh index e9640216..ac5a7780 100755 --- a/examples/federator-fedx/fedx-init/init.sh +++ b/examples/federator-fedx/fedx-init/init.sh @@ -6,3 +6,4 @@ touch $FNAME echo " \"SPARQLEndpoint\" ." >> $FNAME echo " \""$DATASET_ENDPOINT"\" ." >> $FNAME +echo " \"false\" ." >> $FNAME From b7d14b40f6712c4c8e424732ac497e73febdda85 Mon Sep 17 00:00:00 2001 From: Antonis Troumpoukis Date: Sat, 4 Dec 2021 00:45:44 +0200 Subject: [PATCH 3/6] delete old file first --- examples/federator-fedx/fedx-init/init.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/examples/federator-fedx/fedx-init/init.sh b/examples/federator-fedx/fedx-init/init.sh index ac5a7780..ead7c1c3 100755 --- a/examples/federator-fedx/fedx-init/init.sh +++ b/examples/federator-fedx/fedx-init/init.sh @@ -2,8 +2,6 @@ FNAME="/sevod-scraper/output/"$DATASET_NAME".nt" -touch $FNAME - -echo " \"SPARQLEndpoint\" ." >> $FNAME +echo " \"SPARQLEndpoint\" ." > $FNAME echo " \""$DATASET_ENDPOINT"\" ." >> $FNAME echo " \"false\" ." >> $FNAME From a50c4268b9a42a7be780b5757ecaaa200e91993d Mon Sep 17 00:00:00 2001 From: Antonis Troumpoukis Date: Sat, 4 Dec 2021 00:46:41 +0200 Subject: [PATCH 4/6] fix error in yaml --- examples/federator-fedx/fedxtemplate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/federator-fedx/fedxtemplate.yaml b/examples/federator-fedx/fedxtemplate.yaml index f5de891c..2da00dd7 100644 --- a/examples/federator-fedx/fedxtemplate.yaml +++ b/examples/federator-fedx/fedxtemplate.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: maincontainer - image: image: semagrow/fedx-server + image: semagrow/fedx-server ports: - containerPort: 8080 port: 8080 From 3a61676946796831e85ba991f7e50995733f1527 Mon Sep 17 00:00:00 2001 From: Antonis Troumpoukis Date: Sat, 4 Dec 2021 00:51:32 +0200 Subject: [PATCH 5/6] add toy experiment for fedx --- examples/experiment-toybench/toyexp-fedx.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 examples/experiment-toybench/toyexp-fedx.yaml diff --git a/examples/experiment-toybench/toyexp-fedx.yaml b/examples/experiment-toybench/toyexp-fedx.yaml new file mode 100644 index 00000000..a19be544 --- /dev/null +++ b/examples/experiment-toybench/toyexp-fedx.yaml @@ -0,0 +1,13 @@ +apiVersion: kobe.semagrow.org/v1alpha1 +kind: Experiment +metadata: + name: toyexp-fedx +spec: + benchmark: toybench-simple + federatorName: fedx-toy-simple + federatorTemplateRef: fedxtemplate + evaluator: + image: semagrow/kobe-sequential-evaluator + timesToRun: 3 + dryRun: false + forceNewInit: true From 2841f95fe9d77c5ad4ff6279593b45d64002ed8b Mon Sep 17 00:00:00 2001 From: Antonis Troumpoukis Date: Mon, 6 Dec 2021 18:08:42 +0200 Subject: [PATCH 6/6] change template name --- examples/experiment-toybench/toyexp-fedx.yaml | 2 +- .../{fedxtemplate.yaml => fedx-noask-template.yaml} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename examples/federator-fedx/{fedxtemplate.yaml => fedx-noask-template.yaml} (94%) diff --git a/examples/experiment-toybench/toyexp-fedx.yaml b/examples/experiment-toybench/toyexp-fedx.yaml index a19be544..3241c90d 100644 --- a/examples/experiment-toybench/toyexp-fedx.yaml +++ b/examples/experiment-toybench/toyexp-fedx.yaml @@ -5,7 +5,7 @@ metadata: spec: benchmark: toybench-simple federatorName: fedx-toy-simple - federatorTemplateRef: fedxtemplate + federatorTemplateRef: fedx-noask-template evaluator: image: semagrow/kobe-sequential-evaluator timesToRun: 3 diff --git a/examples/federator-fedx/fedxtemplate.yaml b/examples/federator-fedx/fedx-noask-template.yaml similarity index 94% rename from examples/federator-fedx/fedxtemplate.yaml rename to examples/federator-fedx/fedx-noask-template.yaml index 2da00dd7..d62675c4 100644 --- a/examples/federator-fedx/fedxtemplate.yaml +++ b/examples/federator-fedx/fedx-noask-template.yaml @@ -1,7 +1,7 @@ apiVersion: kobe.semagrow.org/v1alpha1 kind: FederatorTemplate metadata: - name: fedxtemplate + name: fedx-noask-template spec: containers: - name: maincontainer