Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
docking
ocladock-fpga
Commits
4c500495
Commit
4c500495
authored
May 28, 2018
by
Leonardo Solis
Browse files
removed deadlocks, now runs smoothly till end
parent
2ded3b42
Changes
4
Hide whitespace changes
Inline
Side-by-side
ofdock_taskpar_xl/Makefile
View file @
4c500495
...
...
@@ -634,7 +634,7 @@ include $(COMMON_REPO)/utility/rules.mk
# Automate test
# "exe" and "xclbin" are rules from "rules.mk"
emu
:
XCL_EMULATION_MODE
=
sw_emu ./hostbin
-ffile
input/1stp/derived/1stp_protein.maps.fld
-lfile
input/1stp/derived/1stp_ligand.pdbqt
-nrun
1
-nev
1
00
-lsit
10
-psize
1
0
XCL_EMULATION_MODE
=
sw_emu ./hostbin
-ffile
input/1stp/derived/1stp_protein.maps.fld
-lfile
input/1stp/derived/1stp_ligand.pdbqt
-nrun
50
-nev
2
00
00
0
debug
:
XCL_EMULATION_MODE
=
sw_emu xgdb
-args
./hostbin
-ffile
input/1stp/derived/1stp_protein.maps.fld
-lfile
input/1stp/derived/1stp_ligand.pdbqt
-nrun
1
-nev
100
-lsit
10
-psize
10
ofdock_taskpar_xl/device/Krnl_Conform.cl
View file @
4c500495
...
...
@@ -169,9 +169,9 @@ while(active) {
#
endif
}
//
#
if
defined
(
DEBUG_ACTIVE_KERNEL
)
#
if
defined
(
DEBUG_ACTIVE_KERNEL
)
if
(
active
==
0x00
)
{printf
(
" %-20s: %s\n"
,
"Krnl_Conform"
,
"must be disabled"
)
;}
//
#
endif
#
endif
for
(
ushort
rotation_counter
=
0
; rotation_counter < DockConst_rotbondlist_length; rotation_counter++)
{
...
...
@@ -517,9 +517,9 @@ while(active) {
}
//
End
of
while
(
active
)
//
#if
defined
(
DEBUG_ACTIVE_KERNEL
)
#
if
defined
(
DEBUG_ACTIVE_KERNEL
)
printf
(
" %-20s: %s\n"
,
"Krnl_Conform"
,
"disabled"
)
;
//
#endif
#
endif
}
//
--------------------------------------------------------------------------
...
...
ofdock_taskpar_xl/device/Krnl_GA.cl
View file @
4c500495
...
...
@@ -564,9 +564,9 @@ void Krnl_GA(
LocalEneCurr[pop_cnt] = energyIA_IC_rx + energyIE_IC_rx;
//
#if defined (DEBUG_KRNL_IC)
#if defined (DEBUG_KRNL_IC)
printf(", IC - rx pop: %u\n", pop_cnt);
//
#endif
#endif
}
// ------------------------------------------------------------------
...
...
@@ -662,9 +662,9 @@ void Krnl_GA(
LocalEneNext[0] = loc_energies[best_entity];
}
//
#if defined (DEBUG_KRNL_GA)
#if defined (DEBUG_KRNL_GA)
printf("Krnl_GA: %u\n", new_pop_cnt);
//
#endif
#endif
float local_entity_1 [ACTUAL_GENOTYPE_LENGTH];
float local_entity_2 [ACTUAL_GENOTYPE_LENGTH];
...
...
@@ -817,9 +817,9 @@ void Krnl_GA(
//printf("test point 5\n");
}
//
#if defined (DEBUG_KRNL_GG)
#if defined (DEBUG_KRNL_GG)
printf("GG - tx pop: %u", new_pop_cnt);
//
#endif
#endif
// Read energy
float energyIA_GG_rx;
...
...
@@ -853,14 +853,15 @@ void Krnl_GA(
*/
inter_valid = read_pipe(chan_Intere2StoreGG_intere, &energyIE_GG_rx);
}
//printf("intra_valid: %i, inter_valid: %i\n", intra_valid, inter_valid);
}
//printf("test point 5\n");
LocalEneNext[new_pop_cnt] = energyIA_GG_rx + energyIE_GG_rx;
//
#if defined (DEBUG_KRNL_GG)
#if defined (DEBUG_KRNL_GG)
printf(", GG - rx pop: %u\n", new_pop_cnt);
//
#endif
#endif
}
// ------------------------------------------------------------------
// LS: Local Search
...
...
@@ -881,7 +882,7 @@ void Krnl_GA(
/*
mem_fence(CLK_CHANNEL_MEM_FENCE);
*/
printf("test point LS 1\n");
//
printf("test point LS 1\n");
ushort entity_ls1 = entity_ls.s0;
ushort entity_ls2 = entity_ls.s1;
...
...
@@ -913,6 +914,8 @@ printf("test point LS 1\n");
write_pipe_block(chan_GA2LS_LS7_energy, &LocalEneNext[entity_ls7]);
write_pipe_block(chan_GA2LS_LS8_energy, &LocalEneNext[entity_ls8]);
write_pipe_block(chan_GA2LS_LS9_energy, &LocalEneNext[entity_ls9]);
//printf("test point LS 2\n");
/*
mem_fence(CLK_CHANNEL_MEM_FENCE);
*/
...
...
@@ -941,6 +944,7 @@ printf("test point LS 1\n");
/*
mem_fence(CLK_CHANNEL_MEM_FENCE);
*/
//printf("test point LS 3\n");
float2 evalenergy_tmp1;
float2 evalenergy_tmp2;
...
...
ofdock_taskpar_xl/device/Krnl_PRNG.cl
View file @
4c500495
...
...
@@ -324,7 +324,7 @@ void Krnl_Prng_LS_float(unsigned int Host_seed,
/*
if
(
!valid
)
{
*/
if
(
valid
=
=
1
)
{
if
(
valid
!
=
0
)
{
/*
success
=
write_channel_nb_altera
(
chan_PRNG2GA_LS_float_prng,
*
(
float*
)
&fixpt_tmp
)
;
*/
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment