unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 0ac7e94de4528d9731dafbbab02b718f4f164800 2471 bytes (raw)
name: gnu/packages/patches/jsoftware-j901-f-fixes.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
 
This patch fixes two separate issues with ustream sources:

* Normalize import paths in jsrc/cip.c

Upstream claims to have some build requirements that force them to use strange
import paths. However, these paths do not exist inside our build chroot.

* Fix unititialized variable warning

Clang 9 issues some warnings which cause the build to fail since upstream
compiles with -Werror.


diff --git a/jsrc/cip.c b/jsrc/cip.c
index 61da4088..fb3c03b6 100644
--- a/jsrc/cip.c
+++ b/jsrc/cip.c
@@ -3,9 +3,9 @@
 /*                                                                         */
 /* Conjunctions: Inner Product                                             */
 
-#include "../../jsource/jsrc/j.h"
-#include "../../jsource/jsrc/vasm.h"
-#include "../../jsource/jsrc/gemm.h"
+#include "j.h"
+#include "vasm.h"
+#include "gemm.h"
 
 #define MAXAROWS 384  // max rows of a that we can process to stay in L2 cache   a strip is m*CACHEHEIGHT, z strip is m*CACHEWIDTH   this is wired to 128*3 - check if you chage
 
@@ -1057,15 +1057,15 @@ static A jtipbx(J jt,A a,A w,C c,C d){A g=0,x0,x1,z;B*av,*av0,b,*v0,*v1,*zv;C c0
  switch(c){
   case CPLUSDOT:
 #define F |=
-#include "../../jsource/jsrc/cip_t.h"
+#include "cip_t.h"
    break;
   case CSTARDOT:
 #define F &=
-#include "../../jsource/jsrc/cip_t.h"
+#include "cip_t.h"
    break;
   case CNE:
 #define F ^=
-#include "../../jsource/jsrc/cip_t.h"
+#include "cip_t.h"
    break;
  }
  R z;
diff --git a/jsrc/gemm.c b/jsrc/gemm.c
index 51fe306e..b105dfc1 100644
--- a/jsrc/gemm.c
+++ b/jsrc/gemm.c
@@ -318,7 +318,7 @@ dgemm_nn         (I              m,
                    _B);
 
 // loop 3
-            I i;
+            I i=0;
 #pragma omp parallel for default(none),private(i),shared(j,l,A,C,mb,nc,kc,alpha,_beta,_mc,_B,rs_a,cs_a,rs_c,cs_c)
             for (i=0; i<mb; ++i) {
                 I mc;
@@ -501,7 +501,7 @@ igemm_nn         (I              m,
                    _B);
 
 // loop 3
-            I i;
+            I i=0;
 #pragma omp parallel for default(none),private(i),shared(j,l,A,C,mb,nc,kc,alpha,_beta,_mc,_B,rs_a,cs_a,rs_c,cs_c)
             for (i=0; i<mb; ++i) {
                 I mc;
@@ -831,7 +831,7 @@ zgemm_nn         (I              m,
                    _B);
 
 // loop 3
-            I i;
+            I i=0;
 #pragma omp parallel for default(none),private(i),shared(j,l,A,C,mb,nc,kc,alpha,_beta,_mc,_B,rs_a,cs_a,rs_c,cs_c)
             for (i=0; i<mb; ++i) {
                 I mc;

debug log:

solving 0ac7e94de4 ...
found 0ac7e94de4 in https://yhetil.org/guix-patches/25Z6NGGGNJYD1.3S7A1QLFX7I9Y@wilsonb.com/ ||
	https://yhetil.org/guix-patches/2P322C327XW0Q.21O5A4IFGMNDI@wilsonb.com/ ||
	https://yhetil.org/guix-patches/3MMTDZQJQ8IR6.334ZWY8AD0487@wilsonb.com/ ||
	https://yhetil.org/guix-patches/24ZUUMG4QYSHN.2OS7YAMCKREUA@wilsonb.com/ ||
	https://yhetil.org/guix-patches/24FU0VP6N4ZZ7.3PE5LG30BSNUQ@wilsonb.com/ ||
	https://yhetil.org/guix-patches/2JQJMV0O718S1.31FZE8GKCTLPF@wilsonb.com/ ||
	https://yhetil.org/guix-patches/3LOAUDT0FLL4U.2SOD925YP915T@wilsonb.com/ ||
	https://yhetil.org/guix-patches/befbc28f660ebe87a8a4e86b3901266c9a475931.camel@gmail.com/ ||
	https://yhetil.org/guix-patches/62d37956f16c08bc4ce26e44da16dce704ddd0f8.camel@gmail.com/

applying [1/1] https://yhetil.org/guix-patches/25Z6NGGGNJYD1.3S7A1QLFX7I9Y@wilsonb.com/
diff --git a/gnu/packages/patches/jsoftware-j901-f-fixes.patch b/gnu/packages/patches/jsoftware-j901-f-fixes.patch
new file mode 100644
index 0000000000..0ac7e94de4

1:27: trailing whitespace.
 
1:34: trailing whitespace.
 
1:36: trailing whitespace.
 
1:62: trailing whitespace.
 
1:71: trailing whitespace.
 
Checking patch gnu/packages/patches/jsoftware-j901-f-fixes.patch...
Applied patch gnu/packages/patches/jsoftware-j901-f-fixes.patch cleanly.
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

skipping https://yhetil.org/guix-patches/2P322C327XW0Q.21O5A4IFGMNDI@wilsonb.com/ for 0ac7e94de4
skipping https://yhetil.org/guix-patches/3MMTDZQJQ8IR6.334ZWY8AD0487@wilsonb.com/ for 0ac7e94de4
skipping https://yhetil.org/guix-patches/24ZUUMG4QYSHN.2OS7YAMCKREUA@wilsonb.com/ for 0ac7e94de4
skipping https://yhetil.org/guix-patches/24FU0VP6N4ZZ7.3PE5LG30BSNUQ@wilsonb.com/ for 0ac7e94de4
skipping https://yhetil.org/guix-patches/2JQJMV0O718S1.31FZE8GKCTLPF@wilsonb.com/ for 0ac7e94de4
skipping https://yhetil.org/guix-patches/3LOAUDT0FLL4U.2SOD925YP915T@wilsonb.com/ for 0ac7e94de4
skipping https://yhetil.org/guix-patches/befbc28f660ebe87a8a4e86b3901266c9a475931.camel@gmail.com/ for 0ac7e94de4
skipping https://yhetil.org/guix-patches/62d37956f16c08bc4ce26e44da16dce704ddd0f8.camel@gmail.com/ for 0ac7e94de4
index at:
100644 0ac7e94de4528d9731dafbbab02b718f4f164800	gnu/packages/patches/jsoftware-j901-f-fixes.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).