Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add alternative checksum for Extrae v4.0.4 #18564

Merged
merged 2 commits into from
Aug 16, 2023
Merged

add alternative checksum for Extrae v4.0.4 #18564

merged 2 commits into from
Aug 16, 2023

Conversation

boegel
Copy link
Member

@boegel boegel commented Aug 15, 2023 •
edited
Loading

(created using eb --new-pr)

Apparently there was a sneaky re-release of Extrae v4.0.4 after #18031 was merged.

Here's the diff between old and new source tarball:

diff -ru extrae-4.0.4.old extrae-4.0.4
diff -ru extrae-4.0.4.old/src/common/Makefile.am extrae-4.0.4/src/common/Makefile.am
--- extrae-4.0.4.old/src/common/Makefile.am	2023-04-20 17:13:53
+++ extrae-4.0.4/src/common/Makefile.am	2022-03-25 17:12:51
@@ -26,7 +26,6 @@
 noinst_LTLIBRARIES = libcommon.la
 libcommon_la_SOURCES = $(common_SRCS)
 libcommon_la_CFLAGS  = $(common_INCLUDES)
-libcommon_la_LDFLAGS = -lrt

 #
 #noinst_PROGRAMS = common
diff -ru extrae-4.0.4.old/src/common/Makefile.in extrae-4.0.4/src/common/Makefile.in
--- extrae-4.0.4.old/src/common/Makefile.in	2023-04-20 17:41:29
+++ extrae-4.0.4/src/common/Makefile.in	2023-07-04 17:35:40
@@ -128,7 +128,7 @@
 am__v_lt_1 =
 libcommon_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libcommon_la_CFLAGS) \
-	$(CFLAGS) $(libcommon_la_LDFLAGS) $(LDFLAGS) -o $@
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -800,7 +800,6 @@
 noinst_LTLIBRARIES = libcommon.la
 libcommon_la_SOURCES = $(common_SRCS)
 libcommon_la_CFLAGS = $(common_INCLUDES)
-libcommon_la_LDFLAGS = -lrt
 all: all-recursive

 .SUFFIXES:
diff -ru extrae-4.0.4.old/src/java-connector/jni/Makefile.am extrae-4.0.4/src/java-connector/jni/Makefile.am
--- extrae-4.0.4.old/src/java-connector/jni/Makefile.am	2022-11-11 11:32:23
+++ extrae-4.0.4/src/java-connector/jni/Makefile.am	2023-07-04 17:35:25
@@ -8,11 +8,7 @@

 javatrace.jar: es/bsc/cepbatools/extrae/Wrapper.java
 	$(JAVAC) $(BASE_DIR)/src/java-connector/jni/es/bsc/cepbatools/extrae/Wrapper.java -d .
-if JAVAH
-		$(JAVAH) -d $(JNI_INCLUDE_DIR) -jni es.bsc.cepbatools.extrae.Wrapper
-else
-		$(JAVAC) -h $(JNI_INCLUDE_DIR) es/bsc/cepbatools/extrae/Wrapper.java
-endif
+		$(JAVAC) -h $(JNI_INCLUDE_DIR) $(BASE_DIR)/src/java-connector/jni/es/bsc/cepbatools/extrae/Wrapper.java
 	$(JAR) cvf javatrace.jar es/bsc/cepbatools/extrae/Wrapper.class

 clean-local:
diff -ru extrae-4.0.4.old/src/java-connector/jni/Makefile.in extrae-4.0.4/src/java-connector/jni/Makefile.in
--- extrae-4.0.4.old/src/java-connector/jni/Makefile.in	2023-04-20 17:41:30
+++ extrae-4.0.4/src/java-connector/jni/Makefile.in	2023-07-04 17:35:41
@@ -882,8 +882,7 @@

 javatrace.jar: es/bsc/cepbatools/extrae/Wrapper.java
 	$(JAVAC) $(BASE_DIR)/src/java-connector/jni/es/bsc/cepbatools/extrae/Wrapper.java -d .
-@JAVAH_TRUE@		$(JAVAH) -d $(JNI_INCLUDE_DIR) -jni es.bsc.cepbatools.extrae.Wrapper
-@JAVAH_FALSE@		$(JAVAC) -h $(JNI_INCLUDE_DIR) es/bsc/cepbatools/extrae/Wrapper.java
+		$(JAVAC) -h $(JNI_INCLUDE_DIR) $(BASE_DIR)/src/java-connector/jni/es/bsc/cepbatools/extrae/Wrapper.java
 	$(JAR) cvf javatrace.jar es/bsc/cepbatools/extrae/Wrapper.class

 clean-local:

I feel these changes are minimal enough to accept both the old and new source tarballs.

@boegel boegel added the bug fix label Aug 15, 2023
@boegel boegel added this to the next release (4.8.1?) milestone Aug 15, 2023
@boegel
Copy link
Member Author

boegel commented Aug 15, 2023 •
edited
Loading

@boegelbot please test @ generoso
CORE_CNT=16

@easybuilders easybuilders deleted a comment from boegelbot Aug 15, 2023
@easybuilders easybuilders deleted a comment from boegelbot Aug 15, 2023
@boegelbot
Copy link
Collaborator

@boegel: Request for testing this PR well received on login1

PR test command 'EB_PR=18564 EB_ARGS= EB_CONTAINER= /opt/software/slurm/bin/sbatch --job-name test_PR_18564 --ntasks="16" ~/boegelbot/eb_from_pr_upload_generoso.sh' executed!

  • exit code: 0
  • output:
Submitted batch job 11482

Test results coming soon (I hope)...

- notification for comment with ID 1679276289 processed

Message to humans: this is just bookkeeping information for me,
it is of no use to you (unless you think I have a bug, which I don't).

@boegelbot
Copy link
Collaborator

Test report by @boegelbot
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in total)
cnx1 - Linux Rocky Linux 8.5, x86_64, Intel(R) Xeon(R) CPU E5-2690 v3 @ 2.60GHz (haswell), Python 3.6.8
See https://gist.github.com/boegelbot/4dba3c5038344f53ff79f9a4549c04e1 for a full test report.

@boegel
Copy link
Member Author

boegel commented Aug 15, 2023

Test report by @boegel
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in total)
node3102.skitty.os - Linux RHEL 8.6, x86_64, Intel(R) Xeon(R) Gold 6140 CPU @ 2.30GHz (skylake_avx512), Python 3.6.8
See https://gist.github.com/boegel/9f3119e099b95baa7aa9254002e45a9d for a full test report.

@boegel
Copy link
Member Author

boegel commented Aug 15, 2023

@boegelbot please test @ generoso
CORE_CNT=16
EB_ARGS="--force-download"

@boegelbot
Copy link
Collaborator

@boegel: Request for testing this PR well received on login1

PR test command 'EB_PR=18564 EB_ARGS="--force-download" EB_CONTAINER= /opt/software/slurm/bin/sbatch --job-name test_PR_18564 --ntasks="16" ~/boegelbot/eb_from_pr_upload_generoso.sh' executed!

  • exit code: 0
  • output:
Submitted batch job 11485

Test results coming soon (I hope)...

- notification for comment with ID 1679395198 processed

Message to humans: this is just bookkeeping information for me,
it is of no use to you (unless you think I have a bug, which I don't).

@boegelbot
Copy link
Collaborator

Test report by @boegelbot
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in total)
cnx1 - Linux Rocky Linux 8.5, x86_64, Intel(R) Xeon(R) CPU E5-2690 v3 @ 2.60GHz (haswell), Python 3.6.8
See https://gist.github.com/boegelbot/cfbc67aa1fc9cca03eb5159551cede95 for a full test report.

@boegel boegel requested a review from casparvl August 16, 2023 10:07
@casparvl
Copy link
Contributor

@boegelbot please test @ jsc-zen2

@boegelbot
Copy link
Collaborator

@casparvl: Request for testing this PR well received on jsczen2l1.int.jsc-zen2.easybuild-test.cluster

PR test command 'EB_PR=18564 EB_ARGS= /opt/software/slurm/bin/sbatch --mem-per-cpu=4000M --job-name test_PR_18564 --ntasks=8 ~/boegelbot/eb_from_pr_upload_jsc-zen2.sh' executed!

  • exit code: 0
  • output:
Submitted batch job 3182

Test results coming soon (I hope)...

- notification for comment with ID 1680647667 processed

Message to humans: this is just bookkeeping information for me,
it is of no use to you (unless you think I have a bug, which I don't).

@boegelbot
Copy link
Collaborator

Test report by @boegelbot
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in total)
jsczen2c1.int.jsc-zen2.easybuild-test.cluster - Linux Rocky Linux 8.5, x86_64, AMD EPYC 7742 64-Core Processor (zen2), Python 3.6.8
See https://gist.github.com/boegelbot/3abad594ba942af49d2616ac5f6b4ad2 for a full test report.

@casparvl
Copy link
Contributor

@boegelbot please test @ jsc-zen2
CORE_CNT=16
EB_ARGS="--force-download"

@boegelbot
Copy link
Collaborator

@casparvl: Request for testing this PR well received on jsczen2l1.int.jsc-zen2.easybuild-test.cluster

PR test command 'EB_PR=18564 EB_ARGS="--force-download" /opt/software/slurm/bin/sbatch --mem-per-cpu=4000M --job-name test_PR_18564 --ntasks="16" ~/boegelbot/eb_from_pr_upload_jsc-zen2.sh' executed!

  • exit code: 0
  • output:
Submitted batch job 3183

Test results coming soon (I hope)...

- notification for comment with ID 1680709840 processed

Message to humans: this is just bookkeeping information for me,
it is of no use to you (unless you think I have a bug, which I don't).

@boegelbot
Copy link
Collaborator

Test report by @boegelbot
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in total)
jsczen2c1.int.jsc-zen2.easybuild-test.cluster - Linux Rocky Linux 8.5, x86_64, AMD EPYC 7742 64-Core Processor (zen2), Python 3.6.8
See https://gist.github.com/boegelbot/af86f2a49e0b547b73823c14ce2b97e6 for a full test report.

@casparvl
Copy link
Contributor

Test report by @casparvl
SUCCESS
Build succeeded for 3 out of 3 (1 easyconfigs in total)
tcn1.local.snellius.surf.nl - Linux RHEL 8.6, x86_64, AMD EPYC 7H12 64-Core Processor, Python 3.6.8
See https://gist.github.com/casparvl/699fc0dc1c15cff0d2b3e84ad776c3c7 for a full test report.

@casparvl
Copy link
Contributor

Going in, thanks @boegel!

@casparvl casparvl merged commit 21350c0 into easybuilders:develop Aug 16, 2023
@boegel boegel deleted the 20230815184207_new_pr_Extrae404 branch August 16, 2023 16:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@casparvl casparvl casparvl approved these changes

Assignees
No one assigned
Labels
bug fix
Projects
None yet
Milestone
4.8.1
Development

Successfully merging this pull request may close these issues.
3 participants
@boegel @boegelbot @casparvl