Commit d904bb40 authored by Leonardo Solis's avatar Leonardo Solis
Browse files

reduce width actmode igl2conf2ie2ia + replace nbchann with blockchan


Former-commit-id: a2b94a73
parent 98189660
......@@ -878,7 +878,8 @@ COPY_DIR := copy_$(PROJECT_NAME)
COPY_DIR_DOCK := $(PROJECT_NAME)
# Make sure this remote-server alias exists (in ~/.ssh/config)
SERVER := sauron
SERVER_BRIDGE := erebor:/scratch/
SERVER_EXEC := sauron:~/ocladock_only-ga
# Delete an existing folder if previously created
# Create a folder $(COPY_DIR) in the parent directory
......@@ -901,16 +902,19 @@ copy: clean-copy
cp -r input/ ../$(COPY_DIR)/$(COPY_DIR_DOCK)/
cp -r wrapcl/ ../$(COPY_DIR)/$(COPY_DIR_DOCK)/
cp -r ../common ../$(COPY_DIR)/
cp ../conf_aoc160_$(SERVER).sh ../$(COPY_DIR)/
cp ../conf_aoc160_sauron.sh ../$(COPY_DIR)/
cd ../; zip -r $(COPY_DIR).zip $(COPY_DIR)
@echo " "
@echo "Transfer the $(COPY_DIR).zip file to $(SERVER) server: "
@echo "Transfer the $(COPY_DIR).zip file to $(SERVER_BRIDGE) server: "
@echo " "
cd ../ && scp $(COPY_DIR).zip $(SERVER):~/
cd ../ && scp $(COPY_DIR).zip $(SERVER_BRIDGE)
@echo " "
@echo "=========================================="
@echo "Files listed were transferred to $(SERVER)"
@echo "=========================================="
@echo "================================================="
@echo "Files listed were transferred to $(SERVER_BRIDGE)"
@echo " "
@echo "Then, transfer files manually "
@echo "from $(SERVER_BRIDGE) to $(SERVER_EXEC) "
@echo "================================================="
@echo " "
clean-copy:
......
......@@ -80,11 +80,19 @@ while(active) {
)) loc_coords [MAX_NUM_OF_ATOMS];
#endif
#if 0
char2 actmode = read_channel_altera(chan_IGL2Conform_actmode);
#endif
char actmode = read_channel_altera(chan_IGL2Conform_actmode);
mem_fence(CLK_CHANNEL_MEM_FENCE);
#if 0
active = actmode.x;
mode = actmode.y;
#endif
active = actmode;
mode = actmode;
//printf("Conform: %u\n", mode);
......@@ -435,12 +443,13 @@ while(active) {
for (uchar pipe_cnt=0; pipe_cnt<DockConst_num_of_atoms; pipe_cnt+=2) {
if (pipe_cnt == 0) {
#if 0
char active_tmp = active;
char mode_tmp = mode;
char2 actmode = {active_tmp, mode_tmp};
write_channel_altera(chan_Conf2Intere_actmode, actmode);
write_channel_altera(chan_Conf2Intrae_actmode, actmode);
#endif
write_channel_altera(chan_Conf2Intere_actmode, /*actmode*/ mode);
write_channel_altera(chan_Conf2Intrae_actmode, /*actmode*/ mode);
}
mem_fence(CLK_CHANNEL_MEM_FENCE);
......
......@@ -33,9 +33,15 @@ channel float chan_LS2Conf_LS9_genotype __attribute__((depth(CHAN_DEPTH_G
// Send ligand-atom positions from Conform to InterE & IntraE
channel float8 chan_Conf2Intere_xyz __attribute__((depth(CHAN_DEPTH_ATOMXYZ)));
#if 0
channel char2 chan_Conf2Intere_actmode;
#endif
channel char chan_Conf2Intere_actmode;
channel float8 chan_Conf2Intrae_xyz __attribute__((depth(CHAN_DEPTH_ATOMXYZ)));
#if 0
channel char2 chan_Conf2Intrae_actmode;
#endif
channel char chan_Conf2Intrae_actmode;
// Send energy values from InterE & IntraE to genotype-senders (IC, GG, LSs)
channel float chan_Intere2StoreIC_intere __attribute__((depth(2)));
......@@ -176,8 +182,14 @@ channel bool chan_GA2LS_Off9_active;
// Send genotype-producer-channel selector and genotype
// from IGL_Arbiter to Conform
#if 0
channel char2 chan_IGL2Conform_actmode __attribute__((depth(9))); // active, mode
#endif
channel char chan_IGL2Conform_actmode __attribute__((depth(3))); // mode
#if 0
channel float chan_IGL2Conform_genotype __attribute__((depth(9*CHAN_DEPTH_GENOTYPE)));
#endif
// Turn-off signal to IGL_Arbiter, Conform, InterE, IntraE
channel bool chan_IGLArbiter_Off;
......@@ -359,6 +371,7 @@ void Krnl_GA(__global float* restrict GlobPopulationCurrent,
#endif
// Read energy
/*
float energyIA_IC_rx;
float energyIE_IC_rx;
bool intra_valid = false;
......@@ -371,7 +384,11 @@ void Krnl_GA(__global float* restrict GlobPopulationCurrent,
energyIE_IC_rx = read_channel_nb_altera(chan_Intere2StoreIC_intere, &inter_valid);
}
}
*/
///*
float energyIA_IC_rx = read_channel_altera(chan_Intrae2StoreIC_intrae);
float energyIE_IC_rx = read_channel_altera(chan_Intere2StoreIC_intere);
//*/
LocalEneCurr[pop_cnt] = energyIA_IC_rx + energyIE_IC_rx;
#if defined (DEBUG_KRNL_IC)
......@@ -594,6 +611,7 @@ void Krnl_GA(__global float* restrict GlobPopulationCurrent,
#endif
// Read energy
/*
float energyIA_GG_rx;
float energyIE_GG_rx;
bool intra_valid = false;
......@@ -606,7 +624,11 @@ void Krnl_GA(__global float* restrict GlobPopulationCurrent,
energyIE_GG_rx = read_channel_nb_altera(chan_Intere2StoreGG_intere, &inter_valid);
}
}
*/
///*
float energyIA_GG_rx = read_channel_altera(chan_Intrae2StoreGG_intrae);
float energyIE_GG_rx = read_channel_altera(chan_Intere2StoreGG_intere);
//*/
LocalEneNext[new_pop_cnt] = energyIA_GG_rx + energyIE_GG_rx;
#if defined (DEBUG_KRNL_GG)
......
......@@ -68,11 +68,19 @@ while(active) {
// Wait for ligand atomic coordinates in channel
// --------------------------------------------------------------
#if 0
char2 actmode = read_channel_altera(chan_Conf2Intere_actmode);
#endif
char actmode = read_channel_altera(chan_Conf2Intere_actmode);
mem_fence(CLK_CHANNEL_MEM_FENCE);
#if 0
active = actmode.x;
mode = actmode.y;
#endif
active = actmode;
mode = actmode;
for (uchar pipe_cnt=0; pipe_cnt<DockConst_num_of_atoms; pipe_cnt+=2) {
float8 tmp = read_channel_altera(chan_Conf2Intere_xyz);
......
......@@ -64,11 +64,19 @@ while(active) {
// Wait for ligand atomic coordinates in channel
// --------------------------------------------------------------
#if 0
char2 actmode = read_channel_altera(chan_Conf2Intrae_actmode);
#endif
char actmode = read_channel_altera(chan_Conf2Intrae_actmode);
mem_fence(CLK_CHANNEL_MEM_FENCE);
#if 0
active = actmode.x;
mode = actmode.y;
#endif
active = actmode;
mode = actmode;
for (uchar pipe_cnt=0; pipe_cnt<DockConst_num_of_atoms; pipe_cnt+=2) {
float8 tmp = read_channel_altera(chan_Conf2Intrae_xyz);
......@@ -108,8 +116,9 @@ while(active) {
for (ushort contributor_counter=0; contributor_counter<DockConst_num_of_intraE_contributors; contributor_counter++) {
char3 ref_intraE_contributors_const;
ref_intraE_contributors_const = intraE_contributors_localcache[contributor_counter];
ref_intraE_contributors_const = intraE_contributors_localcache[contributor_counter];
char atom1_id = ref_intraE_contributors_const.x;
char atom2_id = ref_intraE_contributors_const.y;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment